update gemfile
Merge branch 'master' of https://github.com/bay6/prepare
Merge branch 'master' of https://github.com/bay6/prepare
Make a basic User model (including secure passwords)
Merge pull request #48 from chankaward/master

Finish Chapter 6