initial commit
made the home page responsive
more css changes
merge fixed
css
edit
merge conflicts and such
edit categories
not sure