Plyer Trading, Victory point stuff
Merge remote-tracking branch 'origin/Player' into serialization

Conflicts:
	include/GameBoard.h
	include/Player.h
	src/Player.cpp