Updates to the GUI from Last Week
Merge branch 'master' of https://github.com/jsduren/dev-projects

Conflicts:
	LibraryProject/LibraryProject/SubGUICode.cs