testing UI add questions
Merge branch 'master' into newBranch
UI testing dialogbox opened
testing the UI stuff and josh stuff merged
Merge pull request #202 from rjynn/newBranch

New branch