We have sessions and users!
* 3 tests pass (2 controller tests and 1 feature test)
* As a user, I can create an account with a secure password using BCrypt
* As a user, I can login to my account
merged with local master and fixed merge conflicts
Merge pull request #6 from fiery-skippers-2014/user_login_stuff

User login stuff