changes for state maintainence
changes for state maintainence
resolved with --ours
Merge branch 'master' of https://github.com/abhinav-kr/CognitiveAssistanceOnGoogleGlass