zoom
Merge remote-tracking branch 'upstream/master'
adding filters
resolved conflict
resolved
Merge pull request #2 from benheb/master

Adding zoom functionality to map