use https
travel calculator and new styles
Merge branch 'master' into gh-pages

Conflicts:
	names.html