Deploy to openshift
Map minigame
Merge branch 'master' of https://github.com/rswang/cholera-crossing

Conflicts:
	public/javascripts/game.js
	public/javascripts/map-minigame.js
	views/index.ejs