fixed typo
Merge branch 'master' of https://github.com/bitterfly/6a

Conflicts:
	web/js/data/encounters.js