no message
Merge branch 'master' of https://github.com/Percyvalle/RG

Conflicts:
	RG/RG/Assets/Scripts/GameController.cs
Merge branch 'master' of https://github.com/Percyvalle/RG