added all the good stuff
Merge branch 'master' of https://github.com/k11tj01/sos

Conflicts:
	src/com/comp489/sos/test.java