Filter by circle, and  polygon. Ugh I feel awful
still working on filtering by shape so that when we have the path the functions will be ready to use
Merge branch 'master' into implementNewDraw

Conflicts:
	map.html

fixed
fix to remove shape error
forgot to pull before merging my branch, oh well time to merge again