gitignore
afd

Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez

Conflicts:
	.gitignore
Merge branch 'lopez'