Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java	(revision 72254431498e88f5e85e5411b7393e364e82cca4)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -11,3 +11,4 @@
     List<Articles> findAllByArticlenameContainingIgnoreCase(String name);
     List<Articles> findAllByCategoryListContaining(Categories category);
+    List<Articles> findAllBy();
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java	(revision 72254431498e88f5e85e5411b7393e364e82cca4)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -9,3 +9,4 @@
 public interface CategoriesRepository extends JpaRepository<Categories, Integer> {
     List<Categories> findAllByCategorynameContainsIgnoreCase(String name);
+    List<Categories> findAll();
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java	(revision 72254431498e88f5e85e5411b7393e364e82cca4)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -15,4 +15,5 @@
     Optional<Articles> addToCategory(Integer articleId, Integer categoryId);
     List<Categories> findAllCategoriesByArticle(Integer articleId);
+    List<Articles> findAll();
 
     List<SupplierSuppliesArticleReport> findAllBySupplier(Integer id);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/CategoriesService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/CategoriesService.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/CategoriesService.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -0,0 +1,9 @@
+package com.bazi.fullystocked.Services;
+
+import com.bazi.fullystocked.Models.Categories;
+
+import java.util.List;
+
+public interface CategoriesService {
+    List<Categories> findAll();
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision 72254431498e88f5e85e5411b7393e364e82cca4)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -56,4 +56,8 @@
         Categories category=categoriesRepository.findById(categoryId).orElseThrow(InvalidArgumentsException::new);
         Articles articles=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
+        if(articles.getCategoryList().contains(category))
+        {
+            return Optional.of(articles);
+        }
         articles.getCategoryList().add(category);
         articlesRepository.save(articles);
@@ -68,4 +72,9 @@
 
     @Override
+    public List<Articles> findAll() {
+        return articlesRepository.findAll();
+    }
+
+    @Override
     public List<SupplierSuppliesArticleReport> findAllBySupplier(Integer supplierId) {
         return supplierSuppliesArticleRepository.findAllById_Userid(supplierId);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -0,0 +1,22 @@
+package com.bazi.fullystocked.Services.Implementations;
+
+import com.bazi.fullystocked.Models.Categories;
+import com.bazi.fullystocked.Repositories.CategoriesRepository;
+import com.bazi.fullystocked.Services.CategoriesService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CategoriesServiceImpl implements CategoriesService {
+    private final CategoriesRepository categoriesRepository;
+
+    public CategoriesServiceImpl(CategoriesRepository categoriesRepository) {
+        this.categoriesRepository = categoriesRepository;
+    }
+
+    @Override
+    public List<Categories> findAll() {
+        return categoriesRepository.findAll();
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java	(revision 72254431498e88f5e85e5411b7393e364e82cca4)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -1,6 +1,9 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Models.Articles;
+import com.bazi.fullystocked.Models.Categories;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
 import com.bazi.fullystocked.Services.ArticlesService;
+import com.bazi.fullystocked.Services.CategoriesService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -11,4 +14,5 @@
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Controller
@@ -16,7 +20,9 @@
 public class ArticleController {
     private final ArticlesService articlesService;
+    private final CategoriesService categoriesService;
 
-    public ArticleController(ArticlesService articlesService) {
+    public ArticleController(ArticlesService articlesService, CategoriesService categoriesService) {
         this.articlesService = articlesService;
+        this.categoriesService = categoriesService;
     }
 
@@ -27,5 +33,5 @@
     }
     @PostMapping("/create")
-    public String createInvoice(@RequestParam String aname,
+    public String createArticle(@RequestParam String aname,
                                 @RequestParam String opis,
                                 @RequestParam(required = false) String slika,
@@ -44,5 +50,31 @@
 
         }
-        return "redirect:/homeManager";
+        return "redirect:/manager";
+    }
+    @GetMapping("/category/add")
+    private String categoryArticle(Model m)
+    {
+        List<Articles> articlesList=articlesService.findAll();
+        List<Categories> categories=categoriesService.findAll();
+        m.addAttribute("articles",articlesList);
+        m.addAttribute("categories",categories);
+
+
+        return "addArticleCategory";
+    }
+    @PostMapping("/category/add")
+    private String categoryArticle(@RequestParam Integer article,
+                                   @RequestParam Integer category)
+    {
+    try{
+        articlesService.addToCategory(article,category);
+    }
+    catch (InvalidArgumentsException e)
+    {
+        return "redirect:/articles/category/add?error="+e.getMessage();
+    }
+
+
+        return "redirect:/manager";
     }
 }
Index: FullyStocked/src/main/resources/templates/addArticleCategory.html
===================================================================
--- FullyStocked/src/main/resources/templates/addArticleCategory.html	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/resources/templates/addArticleCategory.html	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="en">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+  <div class="container">
+    <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+      <ul class="navbar-nav m-auto">
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="/questions/manager/list">Одговори прашање</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="/orders/create">Креирај нарчка</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right">
+
+        <li class="nav-item">
+          <a class="btn btn-light btn-sm ml-3" href="/logout">
+            <i class="fa fa-shopping-cart"></i> Logout
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+<div class="text-center">
+  <h2 class="m-2">Додај категорија на артикл</h2>
+</div>
+<form method="POST" action="/articles/category/add">
+  <div class="mt-4">
+    <div class="form-group row">
+      <div class="col-md-3"></div>
+    </div>
+    <div class="form-group row">
+      <div class="col-md-3"></div>
+      <label class="col-form-label col-md-2 font-weight-bold text-left">Артикл</label>
+      <div class="col-md-4">
+        <select name="article" class="form-control">
+          <option disabled selected>Избери артикл</option>
+          <option
+                  th:each="art : ${articles}"
+                  th:value="${art.getArticleid()}"
+                  th:text="${art.getArticlename()}">
+          </option>
+        </select>
+
+      </div>
+    </div>
+    <div class="form-group row">
+      <div class="col-md-3"></div>
+      <label class="col-form-label col-md-2 font-weight-bold text-left">Категорија</label>
+      <div class="col-md-4">
+        <select name="category" class="form-control">
+          <option disabled selected>Избери категорија</option>
+          <option
+                  th:each="cat : ${categories}"
+                  th:value="${cat.getCategoryid()}"
+                  th:text="${cat.getCategoryname()}">
+          </option>
+        </select>
+
+      </div>
+    </div>
+    <div class="row mt-4">
+      <div class="col-md-3">
+      </div>
+      <div class="col-md-6">
+        <input type="submit" value="Додај" class="btn btn-default w-100" />
+      </div>
+    </div>
+  </div>
+</form>
+</body>
+
+</html>