because I have to
Merge branch 'master' of https://github.com/CarletonMaestros/VirtualOrchestra

Conflicts:
	GUI/GUIWindow.xaml
	GUI/GUIWindow.xaml.cs
	Gestures/TempoVolume.cs
	MIDI/MIDI.cs
Meeeeeeeeeerrrrrrrrrrgggggggeeeeeeeeeddddddddd