"end turn button"
added bool return value
Merge branch 'master' into player_turn

Conflicts:
	src/GameController.cpp
Merge pull request #32 from Databean/player_turn

Player turn