Merge branch 'master' of https://github.com/rockyhe/rockykevinleon

Conflicts:
	eece411/phase2/src/phase2Pack/ServerNIO.java
resolve conflict on server.java