add ignore file
.cproject file from MacOS
Merge remote-tracking branch 'github/master'

Conflicts:
	.cproject
	.gitignore