switch trigger behaviour
Merge branch 'master' of github.com:sandroweb/spjam

Conflicts:
	src/Game.js