Initial commit
rails heroku
rails app on heroku
Rails first commit
Merge branch 'master' of https://github.com/mrwilsondj/nightmare

Conflicts:
	README.md