style css
Merge branch 'master' of https://github.com/httpsters/jittery-joes

Conflicts:
	css/style.css