fixed annotation error

fixed the first annotation error but still can’t deploy.
Merge branch 'master' of https://github.com/MadsFrandsen/TravelGood

Conflicts:
	.gitignore
Deployment now works :-)
Merge branch 'master' into TravelGoodRest
Updated tests to use HashMap for flights and hotels instead of lists