it kinda works
Merge branch 'master' of github.com:pmark/GeotemporalMongoose

Conflicts:
	app.js