dealing with checking in a booking form
Merge branch 'master' of https://github.com/kelvinmbwilo/hotel_management_system

Conflicts:
	.idea/workspace.xml
	app/config/database.php