Fixed some collisions and spawning with fish.
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo
	JAMMM/JAMMM/JAMMM/Actors/Actor.cs
Added some dash logic. Changed the starting positions of the fish.
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo
Added spear collisions and death and made sure victory still works.
Merge branch 'master' of https://github.com/atarng/JAMMM
Battle theme
Added some more logic.
Merge branch 'master' of https://github.com/atarng/JAMMM

Conflicts:
	JAMMM/JAMMM.suo
	JAMMM/JAMMM/JAMMM/Actors/Penguin.cs
	JAMMM/JAMMM/JAMMM/Actors/Shark.cs
	JAMMM/JAMMM/JAMMM/Actors/Spear.cs
	JAMMM/JAMMM/JAMMM/Game1.cs
	JAMMM/JAMMM/JAMMM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	JAMMM/JAMMM/JAMMMContent/JAMMMContent.contentproj
	JAMMM/JAMMM/JAMMMContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/atarng/JAMMM
WEEEOH
Some cache.