update with trigger
Merge branch 'master' of github.com:ReidCarlberg/LAB_Google_Glass_Integration