conflicted modification
Merge branch 'master' of https://github.com/Synex-83/GSOM

Conflicts:
	Sammons Projection/SammonsProjectionDemo/SammonsProjectionDemo.v11.suo