Reinit because Heroku is mean
Merge branch 'master' of github.com:jauk/coopswitch

Conflicts:
	.gitignore

Merge