Fixed GPS bug
Combined Calendar and GPS
Merge pull request #13 from jwisch91/master

Fixed GPS bug