release1
Merge branch 'master' of https://github.com/valdenio/BatalhaDoUniverso

Conflicts:
	.gitignore