tudo foi identado
Merge branch 'master' of https://github.com/senacbcc/BCC-2s13-PI2-LOGIKID

Conflicts:
	make/src/config.c
	make/src/gameloop.c
	make/src/init.c