+1

conflict test
Merge branch 'master' of https://github.com/KillerAP/GUI_Project

Conflicts:
	mvo_with_time.m