test branch
Merge branch 'PartTwo' of https://github.com/mengdage/simulater.git into
PartTwo

Conflicts:
	src/gwu/csci/arc/test/Initialization.java