Merge branch 'master' of https://github.com/thiagovas/Macaco-Louco

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/thiagovas/Macaco-Louco

Conflicts:
	main.cpp