Merge branch 'master' of https://github.com/kfriede/Class-Assignment--CS241-Quarter-Project

Conflicts:
	Guidelines-Part I.md
Merge branch 'master' of https://github.com/kfriede/Class-Assignment--CS241-Quarter-Project

Conflicts:
	Guidelines-Part I.md