altrações de hoje
Merge branch 'master' of https://github.com/joao-o/prjprog

Conflicts:
	callbacks.c
	include/structs.h
	proj.c