Modified hotel id (hid) usage
Merge remote-tracking branch 'origin/Iteration1' into Iteration1_M

Conflicts:
	ResortManagement/src/edu/iastate/cs362/Resort/Resort.java
	ResortManagement/src/edu/iastate/cs362/Resort/ResortInterface.java