bug fixes
bug fixes

Merge branch 'master' of https://github.com/JacceApps/GamePlan