name change
Merge branch 'master' of https://github.com/E1701/NeuroColor

Conflicts:
	.DS_Store
ignore .DS_Store