Merge branch 'master' of https://github.com/darrenlcw/travelplan

Conflicts:
	.DS_Store
	index.html
OK