Tested with functions and altered to work correctly

Copied files from Jon's Branch
Card.h - No changes
City.h - No Changes
Player.h - Pass was missing bracket, Finished Charter, shuttle, and
direct got to work correctly
Main.cpp - corrected the conditions