First commit.
Merge branch 'master' of github.com:queirozfcom/joga-facil

Conflicts:
	.gitignore