added rspec, capybara & bcrypt to gemfile
Merge pull request #3 from s-loar/Lienha

added rspec, capybara & bcrypt to gemfile
installed rspec
Merge pull request #4 from s-loar/Lienha

installed rspec
added more gems
Merge pull request #5 from s-loar/addedModelsMigr

added more gems
changed database.yml
fixed gemfile conflicts
Merge pull request #7 from s-loar/Lienha

fixed gemfile conflicts
fixed merge conflicts in gemfile