Merging Chris' branch with heuristicX branch

Pulled in Chris' changes to heuristic functions. Begins the
implementation of calculating a heuristic value for the White player.

Also begins updating the Graph class from Brian's changes.