Commit 11
Commit 13
Merge branch 'master' of https://github.com/lbg8zw/TravelApp

Conflicts:
	main.html
using theirs
using theirs