Merge branch 'master' of heroku.com:gentle-temple-5455

Conflicts:
	.ruby-version