First.
Merge branch 'master' of github.com:adamdecaf/jsond

Conflicts:
	.gitignore
	README.md