first commit
Merge branch 'master' of github.com:pedronauck/test

Conflicts:
	.gitignore