added filtering
Merge branch 'master' of https://github.com/karenknan/shaft-map

Conflicts:
	js/main.js