Merge branch 'master' of https://github.com/williamtrennem/Elyndae

Conflicts:
	Assets/Animation/Clips/Coccinelle 1.controller.meta
	Assets/Animation/Clips/Coccinelle.controller.meta
	Assets/Animation/Clips/Coccinnelle.anim.meta
	Assets/Animation/Clips/didact-apparition.anim.meta
	Assets/Plugins/PlayerControl.cs
	Assets/Scenes/Level.unity
	ProjectSettings/InputManager.asset