Merge branch 'master' of https://github.com/mcaswell/CS_325

Conflicts:
	project3/example-output-4.txt
	project3/local.py
Last Update

All done with this project
Not sure why its making me commit

Sorry if this messes stuff up