initial commit.
Merge branch 'master' of https://github.com/blenolopes/tmp

Conflicts:
	.gitignore