small changes
Merge branch 'master' of https://github.com/jeffvd-a216/gcc-fivecardstud

Conflicts:
	Assignment 2.sdf
	Player.cpp