README
Merge branch 'master' of github.com:krico/jas

Conflicts:
	README.md