Fixed some merge problems.
Merge branch 'master' of https://github.com/ryanmurf/FreeCell