css
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/foodie.css
	views/index.haml