Merge branch 'master' of https://github.com/tylerstalder/morning-raid

Conflicts:
	public/css/styles.css
	routes/index.js
Resolving conflicts