readme.txt and some small changes
Merge branch 'master' of github.com:wubs/485-Project

Conflicts:
	pa2/README.txt