reformatting login
Merge remote-tracking branch 'origin/master'

Conflicts:
	tsa/app/controllers/login_controller.rb
Merge branch 'master' of https://github.com/djlazz3/tsa

Conflicts:
	tsa/app/assets/javascripts/users.js.coffee
	tsa/app/assets/stylesheets/users.css.scss
	tsa/config/routes.rb
	tsa/test/models/users_test.rb