gap game done
Merge pull request #232 from beccannlittle/develop

gap game done
Merge https://github.com/Team-H/gateway into develop

Conflicts:
	gateway/static/js/core/logic.js