Whatever
Merge branch 'master' of https://github.com/MarkAZhang/6824battleship

Conflicts:
	js/client.js
UI stuff
Merge branch 'master' of https://github.com/MarkAZhang/6824battleship

Conflicts:
	js/BSServer.js
	js/client.js
Middle of bug tracking