Doors open on proximity
Merge branch 'master' of github.com:svenstaro/gamejam

Conflicts:
	GGJ2013/src/states/mainstate.lua