seasick inducing waves

Really bad wave motion. Like, really bad.
Merge branch 'master' of https://github.com/martydd3/PennPlay

Conflicts:
	PennPlayAndroid/src/com/android/pennplay/Ship.java