Some changes
merged
Merge branch 'master' of https://github.com/bshultz/PointsGame
Merged
Merge branch 'master' of https://github.com/bshultz/PointsGame