pre-branch cleaning
cleaning with pylint
Merge branch 'PointObject'

Conflicts:
	battleship/board.py
more cleaning