Plo
Merge branch 'master' of https://github.com/ldorelli/tcc

Conflicts:
	src/kakaroto.cpp
	src/kakaroto.hpp
Bla
Wow
Sei nao
go