removed log
Merge branch 'master' of https://github.com/cstoquer/oodio
Merge branch 'master' of https://github.com/cstoquer/oodio

Conflicts:
	main.cpp