new project
Merge branch 'master' of https://github.com/CedricTchabat/kolafrik

Conflicts:
	pom.xml