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

Conflicts:
	KaiJaScroller/Classes/Statics/Assets.cs