Commit before merge
fix merge
Merge branch 'master' of https://github.com/CMPUT301F14T16/QuestionAppProject