Eclipse C++ project referring to a local git repository.
Merge branch 'master' of https://github.com/aldgoff/cbk_cpp3

Conflicts:
	src/main.cpp