pep8 clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	epicduels/model/board.py
pep8 clean up