d
d
partial zip filtering logic complete
Merge branch 'master' of https://github.com/akosel/DataDive

Conflicts:
	js/map.js
Merge branch 'master' of https://github.com/akosel/DataDive

Conflicts:
	css/stylesheet.css
	index.html