Set up for Heroku
Set up for Heroku2
Merge branch 'master' of github.com:perry3/sekaidokei

Conflicts:
	config/routes.rb