MISC.
MISC
Merge branch 'master' of https://github.com/smoore-ms9/UMBC-CMSC_345_TWIX

Conflicts:
	GUI_IMAGES/Thumbs.db