added markers, check gps status
Merge branch 'master' of https://github.com/narcolepticsnowman/Beer-Journal