update
Merge branch 'master' of https://github.com/nygeog/jawbone

Conflicts:
	.Rapp.history