almost done
blahblahal
akdgjalk
Merge branch 'master' of https://github.com/chiem14/cs376Proj

Conflicts:
	main.c
	prog