Changed README.md
Merge branch 'master' of git://github.com/AlexLDoran/CSCI3308Lab3

Conflicts:
	README.md