Conga additions
Adding files
Merge branch 'master' of https://github.com/BrainComputationLab/MUSE

Conflicts:
	MUSE-GUI/MUSE.pro.user
Pushing final changes so far.