Sorting homepage
Getting changes
Merge branch 'master' of https://github.com/joshricha/project_2
Categories edit
Trying to merge
Merge branch 'master' of https://github.com/joshricha/project_2
Categories refactor
Fix
Categories are WORKINGgit add . Small SQL query added
Merge conflict sorted