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

Conflicts:
	js/BSServer.js
More fixes
Temp