V1 AM, UM
Merge branch 'master' of https://github.com/smoore-ms9/UMBC-CMSC_345_TWIX

Conflicts:
	Documents/Technical Reports/TWIX_AM.doc
V1 AM UM