lotz
Merge branch 'V1.0' of github.com:Ianpwest/Trax2.0 into V1.0

Conflicts:
	Trax2.0/MainWindow.xaml