Corrigindo merge

www/states/MainMenu.js

@@ -22,13 +22,11 @@ MainMenu.prototype = {
 	create: function() {
 		game.state.add('mapState', mapState);
 
-<<<<<<< HEAD
+
 		//musica do menu
 		musicaMenu = game.add.audio('musicaMenu');
 		musicaMenu.play();
 
-=======
->>>>>>> AtividadeQuebraCabeca
 		background = game.add.sprite(0, 0, 'background');
 		background.width = game.width;
 		background.height = game.height;

www/states/mapState.js

@@ -34,13 +34,9 @@ mapState.prototype = {
 		ocean = game.add.sprite(0, 0, 'ocean');
 		ocean.width = game.width;
 		ocean.height = game.height;
-<<<<<<< HEAD
-
 		//som do oceano
 		somOceano = game.add.audio('somOceano');
 		somOceano.play();
-=======
->>>>>>> AtividadeQuebraCabeca
 
 		ilhaTerror = game.add.sprite(W/5, H/5, 'ilhaTerror');
 		ilhaTerror.animations.add('ilhaTBrilha', [2, 3, 2, 3, 2, 3, 2, 0], 7, false);