Fix C&P bug
Merge branch 'master' of https://github.com/BlueBrain/Hello

Conflicts:
	tests/CMakeLists.txt
Merge pull request #4 from eile/master

Fix C&P bug