Testing
Merge branch 'master' of https://github.com/eina0163/TMPTouristAppV2

Conflicts:
	.gitignore