Functional & working.
Merge branch 'master' of https://github.com/jwheels/cs437-1

Conflicts:
	makefile