layout
Merge branch 'psuminski'

Conflicts:
	app/assets/stylesheets/custom.css.erb