Finish layouts and routes
Merge branch 'layout'

Conflicts:
	Gemfile
	Gemfile.lock
Merge gemfile