no message
Merge branch 'master' of https://github.com/Epono/VvVvV

Conflicts:
	Assets/Scripts/Game/ClassicPlayerScript.cs
Merge branch 'master' of https://github.com/Epono/VvVvV
no message
Merge branch 'master' of https://github.com/Epono/VvVvV

Conflicts:
	Assets/Scenes/Game.unity