application layout prepare
users controller prepare
some styles
strange background =D
Merge remote-tracking branch 'origin/master' into implement_user

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb