Change the way the dock works.
Merge branch 'master' of https://github.com/bsanders/softeng

Conflicts:
	MainWindow.xaml
	MainWindow.xaml.cs