On peut cliquer
Merge branch 'master' of https://github.com/Epono/VvVvV

Conflicts:
	Assets/Prefabs/Game/Coin.prefab
	Assets/Scenes/Game.unity