Latest Copy

WHY RANDOMLY BUGGY?!?! :(
Merge branch 'master' of https://github.com/kjt54/cs341project

Conflicts:
	yad4.kt54.project1.circ