more changes.
Merge branch 'master' of github.com:o4dev/AroundTheWorld

Conflicts:
	index.html
fix git errors.
Some styling and javascript recovery.