Minor fixes
Added ignored files to git ignore
Merge branch 'master' of https://github.com/aptitud/SimpleBattleship

Conflicts:
	client/index.html
	server/server.js
Merge remote-tracking branch 'origin/master'
Minor fixes