finally have stuff up on the page
starting styling
categories work in progress
Merge remote-tracking branch 'origin/master' into categories_styling
finally have icons showing
added meta tag, responsiveness, and other stuff
fixing merge conflict with tmp