Improve the README file
Update Gemfile.lock for Heroku
Merge branch 'master' of https://github.com/CyParker/first_app

Conflicts:
	README
Improve the README file