Automated testing partial - this doesn't work as-is - pushing to backup
Merge branch 'master' of https://github.com/kmorin1/CMPUT415-DashAB

Conflicts:
	DashAB Compiler Project/src/dash/TypeExpand.tokens
	DashAB Compiler Project/src/dash/TypeTranslate.tokens