Change layout welcome
Add controller before sign in
Merge branch 'hung'

Conflicts:
	Gemfile