separate views
Merge

Conflicts:
	app/assets/stylesheets/main.css
	config/routes.rb