commit
Merge branch 'master' of https://github.com/pierson16/cs376Proj

Conflicts:
	main.c

commit