primeiro commit
Merge branch 'master' of https://github.com/rodrigoguedes/pingfire

Conflicts:
	.gitignore