i do not want commit but …
Merge branch 'master' of https://github.com/ccxued/CCS

Conflicts:
	.DS_Store