make a session model as well as controller
Merge branch 'clean'

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb
	config/routes.rb
move the separate migrations into the original generates
Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/show.json.jbuilder
	db/migrate/20140306014123_add_index_to_users_email.rb
	db/migrate/20140306014125_add_index_to_users_user_name.rb
	db/migrate/20140306014128_add_password_digest_to_users.rb
	db/migrate/20140306014130_add_remember_token_to_users.rb
	db/schema.rb