final report draft
Merge branch 'master' of https://github.com/bdkoepke/hotelmanager

Conflicts:
	app/models/room_service.rb