commit
Merge branch 'master' of https://github.com/davidgaskins/326

Conflicts:
	labs/lab7/lab7.c
	projects/project5/p5