Finish layout and routes
User model
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	spec/requests/static_pages_spec.rb