leaflet demo to test plugins
Merge branch 'master' of https://github.com/integrityapplications/pinz into jsleaflet
testLeafletPlugins - added marker clustering
Merge branch 'master' of https://github.com/integrityapplications/pinz into jsleaflet
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet

Conflicts:
	.gitignore
meh
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
client: added leaflet to webpage
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
Merge branch 'master' of github.com:integrityapplications/pinz into jsleaflet
client: minor changes
Merge branch 'master' of github.com:integrityapplications/pinz
aded radio btn to client
Merge branch 'master' of github.com:integrityapplications/pinz
updating datagen to contiously run and take command line params
Merge branch 'master' of github.com:integrityapplications/pinz

Conflicts:
	resources/datagen.js
formatting stuff

formatted server code, the indent was 8 spaces
added to readme
changed title of app
oops readme
more oops readme
merge with master