Merge origin/master
Hotel class now has a sortByPrice function
Bellagio constructor complete
Rooms now implements Comparable (two new functions compareTo and priceComparator)
Merge origin/master

Conflicts:
	ProjectHotel/src/projecthotel/Hotel.java