uploading files
Merge branch 'master' of https://github.com/jonpage/pando

Conflicts:
	README.md
Uploading package.json and shell.html
Merge branch 'master' of https://github.com/jonpage/pando

Conflicts:
	README.md