teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/images/bkpdoor.zip.meta
	Assets/images/door/door.png.meta
	Assets/images/itens/andom_items___bead_sprites.fw.png.meta
	Assets/musicas/Sum-1_-_Alien_Phone_Sex.mp3.meta
	Assets/scenes/Lvl1.unity
	Assets/scenes/Lvl2.unity.meta
	Assets/scenes/gameover.unity.meta
	Assets/scripts/CheckString_Door.cs.meta
	Assets/scripts/StringRecord.cs.meta
	Assets/scripts/enigma.cs.meta
	Assets/scripts/player.cs
	ProjectSettings/EditorBuildSettings.asset