few edits
Merge branch 'master' of https://github.com/mantzouj/battleships

Conflicts:
	battleships.qws
	db/battleships.db_info