added tests for SalorHospitality
Merge branch 'master' of github.com:jasonknight/ichabod

Conflicts:
	Makefile