updated
updated
Merge branch 'master' of https://github.com/jacoblwright/cs462

Conflicts:
	lab1.krl