8-criar-ufoa
closes #8
Integra��o do UfoB
Merge pull request #32 from startupcursos/8-criar-ufoa

8-criar-ufoa
Merge branch 'master' of https://github.com/startupcursos/jogo-acao

Conflicts:
	cocos2d.js
	src/resource.js
planta ok
Merge branch 'master' into 7-Criar-inimigo-do-tipo-planta

Conflicts:
	cocos2d.js
	res/HD/spritesheet.plist
	res/HD/spritesheet.png
	res/Normal/spritesheet.plist
	res/Normal/spritesheet.png
	res/spritesheet.plist
	res/spritesheet.png
	src/layers/GameLayer.js
	src/resource.js
Merge pull request #33 from startupcursos/7-Criar-inimigo-do-tipo-planta

planta ok
Atualizacao do spritesheet
Integra��o dos inimigos
imagem pedra
Merge branch 'master' into 6-criar-inimigo-tanque

Conflicts:
	cocos2d.js
	res/HD/big-stone.png
	res/HD/little-stone.png
	res/HD/spritesheet.plist
	res/HD/spritesheet.png
	res/HD/ufo-1.png
	res/Normal/big-stone.png
	res/Normal/enemy-bullet-v.png
	res/Normal/ground.png
	res/Normal/groundAcidentado.png
	res/Normal/hole-big.png
	res/Normal/hole-small.png
	res/Normal/hole.png
	res/Normal/landscape1.png
	res/Normal/landscape2.png
	res/Normal/naveseguidora.png
	res/Normal/rolling-stone.png
	res/Normal/spritesheet.plist
	res/Normal/spritesheet.png
	res/Normal/ufo-1.png
	src/layers/GameLayer.js
	src/resource.js
	src/scenes/LevelOneScene.js
	src/sprites/EnemyBulletV.js