fixing merge conflicts for responsive categories index page
fixing some merge issues
just realized improper merging of projects css. time for a really long long long long long commit committed commits
Merge branch 'mergin_conflicts'