started on Iteration 2 work
Merge remote branch 'origin/Iteration1' into Iteration1
Merge branch 'Iteration1' into Iteration2

Conflicts:
	ResortManagement/src/edu/iastate/cs362/RentalCenter/RentalCenterControllerInterface.java
	ResortManagement/src/edu/iastate/cs362/RentalCenter/RentalCenterInterface.java
	ResortManagement/src/edu/iastate/cs362/Resort/ResortInterface.java
Merge remote branch 'origin/Iteration2' into Iteration2