Cage is back
Stole the chuck norris favicon image for testing
thisbloddythingwontrunonherokuandimrunningoutofideas
experimenting with Procfile
Procfileofsatan
reverted satan
testing heroku
Merge branch 'master' of heroku.com:pacific-temple-3094

Conflicts:
	src/resources/public/index.html
Merge branch 'master' of heroku.com:pacific-temple-3094
Changed .travis.yml, to make Travis deploy to Heroku