Home page looks better!
Merge branch 'HomePage'

Conflicts:
	app/models/user.rb