Update README
Merge branch 'master' of https://github.com/ossie7/INFPROGX

Conflicts:
	README.txt