Merge remote-tracking branch 'origin/dev-clayton' into dev-jordon
Merged with Clayton's model
Fixing comments
Merge branch 'dev-jordon' of https://github.com/acdupont/mdd_project1 into dev-clayton

Conflicts:
	source/creator.als