checkout
Merge branch 'master' of https://github.com/dinamagdalena/KELOMPOK8

Conflicts:
	KELOMPOK8/KELOMPOK8/DbHotel.mdf
	KELOMPOK8/KELOMPOK8/DbHotel_log.ldf