removed some problematic dead code I had been using to spike
Merge pull request #52 from Databean/remove_stupid_line

removed some problematic dead code I had been using to spike. which was breaking master on my machine whoops
Merge branch 'master' into DevCardUImerger

Conflicts:
	include/GameBoard.h
	src/GameBoard.cpp
	src/GameController.cpp
Trying to fix conflicts and get this working.