locking in changes
Merge branch 'master' of https://github.com/jsuich/SurveyGibbon