Merge branch 'master' of github.com:ghitchens/nervex

Conflicts:
	README.md
Merge branch 'master' of github.com:ghitchens/nervex

Conflicts:
	README.md