updated readme
Merge branch 'master' of https://github.com/ccard/csci565Project2

Conflicts:
	README.md