upstream merge
Merge remote-tracking branch 'upstream/master'
add username login
cleaning up code
still cleaning up code
further cleaning code
last clean up
cleaned up code
added placehoders
converted to haml
added back in protect_from _forgery into controller
'changed messages'
'added test for failed sign in'
Merge branch 'master' of github.com:RanSolo/squmblr into RanSolo-master

* 'master' of github.com:RanSolo/squmblr:
  'added test for failed sign in'
  'changed messages'
  added back in protect_from _forgery into controller
  converted to haml
  added placehoders
  cleaned up code
  last clean up
  further cleaning code
  still cleaning up code
  cleaning up code
  add username login
  upstream merge

Conflicts:
	app/models/user.rb
Merge branch 'RanSolo-master'

* RanSolo-master:
  'added test for failed sign in'
  'changed messages'
  added back in protect_from _forgery into controller
  converted to haml
  added placehoders
  cleaned up code
  last clean up
  further cleaning code
  still cleaning up code
  cleaning up code
  add username login
  upstream merge
Clean up ordering of user model.