rails g devise:views
User can recover password with email or username
fixed some whitespace
Fixed comments and undid login via username
Face palm with indentation
Merge branch 'master' of github.com:RJFryman/squmblr into RJFryman-master

* 'master' of github.com:RJFryman/squmblr:
  Face palm with indentation
  Fixed comments and undid login via username
  fixed some whitespace
  User can recover password with email or username
  rails g devise:views

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

* RJFryman-master:
  Face palm with indentation
  Fixed comments and undid login via username
  fixed some whitespace
  User can recover password with email or username
  rails g devise:views