Updating the Conflict Hours to have a short description quote.
Merge branch 'gh-pages' of github.com:skriptble/reserve into gh-pages