don't know anymore
Merge branch 'master' of https://github.com/kvahed/codeare

Conflicts:
	src/CMakeLists.txt
Merge branch 'master' of https://github.com/kvahed/codeare
Tests in Windows 64