temp add
Merge branch 'master' of https://github.com/CognitionGuidedSurgery/msml

Conflicts:
	.pydevproject
	.settings/org.eclipse.core.resources.prefs
Removed pydev project & setting from Git