add endOfHour and beginningOfHour methods
merge conflicts