i thought this was ignored already
Merge branch 'master' of https://github.com/kmanship/unearthed-drillhole
Merge branch 'master' of https://github.com/kmanship/unearthed-drillhole
Merge branch 'master' of https://github.com/kmanship/unearthed-drillhole
blah
added point clustering
fixed conflicts
fixed data parsing
Merge /Volumes/INC/unearthed-drillhole

Conflicts:
	unearthed-web/src/main/webapp/scripts/app.js
	unearthed-web/src/main/webapp/scripts/mapController.js
	unearthed-web/src/main/webapp/static/json/collar.json
	unearthed-web/src/main/webapp/stylesheets/styles.css