More coding

I have only change some methods and add more  comments
Merge branch 'master' of https://github.com/pmlt/comp354

Conflicts:
	src/src/simulator/ConnectionClient.java
	src/src/simulator/Mainfunction.java