spear stuff
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo
	JAMMM/JAMMM/JAMMM/Actors/Shark.cs
 merge