initial controller and views
Merge branch 'master' into controller

Conflicts:
	db/seeds.rb