fixed tests
fixed steps
Merge branch 'reservationTests' of https://github.com/joh641/calteach into reservationTests
reverted reservation model
Merge pull request #68 from joh641/reservationTests

fixed tests