Something somethign something
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into
iteration3

Conflicts:
	src/experiment/AppWindow.java