first commit
Merge branch 'master' of github.com:harn/joey

Conflicts:
	README.md