Changed if else to switch
Merge branch 'master' of github.com:dsschwarz/dimensional

Conflicts:
	objects.js
Post-merge fixes

Changed shiftObject reference, renamed vars in objects.js