* test
* test
Merge branch 'master' of https://github.com/fbertaux/TestEasyCell

Conflicts:
	test.cpp