better generators
strange collision detection
Merge branch 'master' of github.com:time-traveling-pineapple/winter-game-jam

Conflicts:
	src/js/engine/GameViewport.js
	src/js/engine/Viewport.js