gitignore
Merge branch 'master' of https://github.com/Xawier/HotelSystem

Conflicts:
	.gitignore