rebasing to master
committing changes
Merge branch 'master' of https://github.com/jsuich/SurveyGibbon
Merge branch 'master' of https://github.com/jsuich/SurveyGibbon