Got an animation to work!
Merge remote-tracking branch 'origin/master'

Conflicts:
	deprecated/floorEmulator.py