Updated hours to have both begin and end times, this commit fixes issue #8
Merge branch 'project'