created rails project, changed gemfile
Merge branch 'master' of github.com:stephen-parker/wdi_solo_project_1

Conflicts:
	README.md