more features
Merge branch 'master' of https://github.com/Sprotte/WhereIsLink

Conflicts:
	Assets/Animations/Characters/Crono/idle.anim
	Assets/Animations/Characters/Crono/walkDown.anim
	Assets/Animations/Characters/Crono/walkLeft.anim
	Assets/Animations/Characters/Crono/walkRight.anim
	Assets/Animations/Characters/Crono/walkUp.anim
	Assets/Animations/SwordAttack/Sword.controller.meta
	Assets/Effects/Detonator Explosion Framework/Resources/Detonator/Textures.meta
	Assets/Scenes/StartMenu.unity.meta
	Assets/Scenes/World.unity
	Assets/Scripts/Flip.cs.meta
bla
Merge branch 'master' of https://github.com/Sprotte/WhereIsLink

Conflicts:
	Assets/Scenes/World.unity