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

Conflicts:
	src/experiment/AppWindow.java
Bug fix for Soaps in the DB
To use updateSoap now, you just have to pass in the edited soap with the
changes. Becareful though! you will need the proper key to update it!
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into
iteration3

Conflicts:
	src/experiment/AppWindow.java