More fixes
merging
Merge branch 'master' of https://github.com/CindyBerghuizen/BallOfMud

Conflicts:
	Assignment 4/DomainDecisions.tex