Merge branch 'master' of https://github.com/DanielAlvarezCastro/Global-GameJam

# Conflicts:
#	Assets/Scenes/Phase1/Main.unity