find and replace order with reservation
change order to reservation in seed file
find and replace item with property
rename item controllers & model to property
fix category relationship, no longer many-to-many
fix merge conflicts - oops, didn't pull first
oops, put back Danny's edit, plus my renaming
remove delivery-related stuff
change user first/last name back to name, made migration rollback-able
rename order model to reservation
fix relationship to property, no longer many-to-many
rename order_cart to reservation_cart
silence load_cart method for now so logging in actually does something
Merge pull request #5 from dalexj/renaming

Renaming