implement initial devise functionality
fix merge conflicts in gemfile
tweak gemfile.lock
add views necessary to login/create user/logout
change app root from main page to the house show page
enforce the user is logged in before viewing the main house page
start writing feature tests for signing up
fix merge conflict in gemfile.lock
add more to user can sign up feature spec
fix merge conflicts in schema.rb and gemfile.lock
finish feature tests for creating a new account
finish feature tests for user logging in
add unit tests for user model
remove generated code from user model
Merge pull request #4 from purple-martins-2013/implement-devise

Implement devise