[[
Merge branch 'master' of https://github.com/hyune/MindSharerCP

Conflicts:
	MindSharerCPM/.project
k