fixed md in readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
updated readme and package.json for jam