commit inicial
Merge branch 'master' of https://github.com/lferreira/ilancei

Conflicts:
	.gitignore