small part missed
merge
fixed tests
Merge pull request #67 from joh641/fix-features

Fix features
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
Merge branch 'master' into view-and-code-climate-fixes
moved some checks from reservation controller to model
removed edit links from reservation dashboard