updated andrews changes
Merge branch 'master' of https://github.com/camda280/okr