début lvl3
clean
 level
Clean clean >_<
Merge branch 'master' of https://github.com/williamtrennem/Elyndae

Conflicts:
	Assets/Plugins/PlayerControl.cs
	Assets/Scenes/Level.unity
	ProjectSettings/InputManager.asset
merge