latest stuff
Merge branch 'master' of https://github.com/kgoodwill/geopebble

Conflicts:
	index.html