new main page design testing
little fix
try to fix video
Merge remote-tracking branch 'origin/master' into signout_button

Conflicts:
	app/models/user.rb