2

2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Horror.hx
Merge branch 'master' of https://github.com/bqprod/ld31

Conflicts:
	src/Game.hx
	src/Horror.hx