updates
Merge branch 'master' of github.com:kikz4life/globe-labs-client