unstage cproject and project
Merge branch 'master' of https://github.com/optimad/PABLO.git
Merge branch 'master' of https://github.com/optimad/PABLO.git

Conflicts:
	.gitignore