I swear I will stop changing the schema... soon... lol
Merge branch 'iteration3' of https://github.com/NameCT/CIS/ into
iteration3

Conflicts:
	src/cis/buisness/Soap.java