.
Merge branch 'master' of https://github.com/matheusr94/ProjetoJogo

Conflicts:
	JogoSpaceBattle/nbproject/private/private.properties