Added switches
Merge branch 'master' of github.com:MrHalfman/ld26

Conflicts:
	js/entities.js