updated encounters
Merge branch 'master' of github.com:bitterfly/6a

Conflicts:
	web/js/main.js
removed encounter_images
Merge branch 'master' of github.com:bitterfly/6a