refactor
Merge remote-tracking branch 'origin/master'
refactor and reformat hotel
ignore compiled files and config files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/hotelreservation/Hotel.java