first commit
resolvendo conflitos do git ignore