Don't waste time on this!
Remove junk
Remove junk
Remove more junk
Update Gemfile.lock for Heroku
Merge branch 'master' of github.com:alxbuilder/demo

Conflicts:
	README