some stuff from a while ago
using skitch Sound
Merge branch 'master' into HEAD -- crappy, unfinished zoom

Conflicts:
	tetherball/src/main/scala/tetherball/things/Player.scala