Refactored overlap method
Merge branches 'master' and 'ccReservationFix' into ccReservationFix
bug fix
Merge pull request #161 from joh641/ccReservationFix

Cc reservation fix