change
Merge branch 'master' of https://github.com/bojangles495/THE_GAME

Conflicts:
	THE_GAME/game/Board.py
	THE_GAME/game/Board.py~
	THE_GAME/game/__init__.py
change again