Added javadoc, removed unneeded imports
Merge branch 'master' of github.com:MarsEdge/OUCS2334