zh54t54
Merge branch 'master' of https://github.com/FuryFurious/KaiJaScroller

Conflicts:
	KaiJaScroller/Classes/ComponentCollection/Brains/PlayerBrain.cs
fred
Merge branch 'master' of https://github.com/FuryFurious/KaiJaScroller
Map Stuff