deleted import java.util.* for no reason
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cs2103/HelloWorld.java