Layouts done, working on homepage next
Merge branch 'master' into layouts

Conflicts:
	db/seeds.rb