atualizacao clique resposta
Merge branch 'master' of https://github.com/adventurelog/master

Conflicts:
	adventurelog
	include/pi_data.h
	include/pi_tools.h
	src/pi_tools.c
	src/tela_organizando.c
limpando a pasta
colisao implementada