added questionnaire, finished settings screen
Merge branch 'master' of https://github.com/MCFAD/oxylyzer