Revert 54a51ce..08f4a31

This rolls back to commit 54a51ced07e527701e227f5bd612affaa7cc23db.
Revert 2ba2a17..f799560

This rolls back to commit 2ba2a17936c7fbb08b29f53fb5d10fb3ee967144.
Revert a506e20..2a8acbf

This rolls back to commit a506e2014e4e714b48f8bb7f15bb464a61744b4a.
Revert 9b5d4be..2735c4a

This rolls back to commit 9b5d4bed75d68a2847e32498be1381da5f062729.
Revert 2735c4a..10ff59c

This rolls back to commit 2735c4a86ab4e4dfcd40ec6acf98e9462d4996cd.
Revert "Revert e89b86d..b031a90"

This reverts commit 2ba2a17936c7fbb08b29f53fb5d10fb3ee967144.

Conflicts:
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/user.rb
	app/views/sessions/new.html.erb