testing!

It works!
"end turn button"
Fixed mah makefile.

Love,

Marty
added bool return value
Merge branch 'master' into player_turn

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

Player turn
Merge branch 'master' of https://github.com/Databean/warsofcatan
Delete .project

Remember to not commit project files
Merge branch 'master' into DevCardUImerger

Conflicts:
	include/GameBoard.h
	src/GameBoard.cpp
	src/GameController.cpp
RESOLVED, but I may have broken UnitTest++