Merge branch 'master' of https://github.com/siegelhorn/Traveler

Conflicts:
	js/alternative.js
fix merge conflict