Fusioonn !

Superbe fusion de ouf
Merge branch 'master' of https://github.com/Tavrox/FrondEsc

Conflicts:
	Assets/Scripts/Background.cs
	Assets/Scripts/GameLoop.cs