Updated questions
Merge branch 'Hourspage'