changes commited
Merge branch 'master' of https://github.com/CMUCognisense/Cognisense