Debugged BSServer and client
Merge branch 'master' of https://github.com/MarkAZhang/6824battleship

Conflicts:
	js/client.js
	js/game_states/battleship_game_state.js
server and client seem to be working