Installed devise gem
rails generate devise:install
Added user model for devise
User can not register at the moment
Added action mailer config
Removed old erb file
Added some basic layouting stuff
Added Devise Views in haml
Added simple login page
user can now sign up
Merge branch 'master' into users

Conflicts:
	Gemfile.lock
explicit version requirements for most gems
* removed erb view template
Merge branch 'master' of github.com:New-York-Falcons/car-trading into users

Conflicts:
	Gemfile
fixed Gemfile.lock which got corrupt during merge
explict version requirement for spring gem
Fixed Typo
Merge pull request #1 from New-York-Falcons/users

Users
merge (?) auction/master