filter test
Merge branch 'master' of https://github.com/Avnerus/ggj2

Conflicts:
	game.js