Iniciando os commits :D
Teste
Merge branch 'master' of http://github.com/motioncrazy/whatisit

Conflicts:
	changelog.txt