Update README.md
Merge branch 'master' of github.com:chuckpreslar/codex

Conflicts:
	README.md