Stuff
Merge branch 'master' of https://github.com/undefinedio/shitty-guide-app

Conflicts:
	www/css/main.css