Merge branch 'master' of 192.168.2.163:repos/nmax
Merge README.md edits

Merge branch 'master' of https://github.com/zoe-1/nmax

Conflicts:
	README.md