modified README
Merge branch 'master' of https://github.com/davidpwilliamson/info2300test

Conflicts:
	README.md