Hadouken!
Merge branch 'master' of https://github.com/gmfgames/testeGitHub

Conflicts:
	Assets/ScriptTeste.cs
Merge branch 'master' of https://github.com/gmfgames/testeGitHub