Merge pull request #3 from Sidnah/dev

Dev
Merge pull request #5 from Sidnah/dev

PR from dev
Merge pull request #6 from Sidnah/dev

heroku && rspec install
heroku
heroku
gem
bundle updating sqlite3
bundle
try
Merge pull request #7 from Sidnah/master

Heroku