C and C++ files now separate
Merge branch 'master' of https://github.com/vvertigoo/vadim-maxi_private

Conflicts:
	.DS_Store