changes to styling on forem
Merge branch 'master' of https://github.com/4thsource/modernmeal

Conflicts:
	config/routes.rb