omitted prog exe from being committed/pushed
hMerge branch 'master' of https://github.com/wellnitz16/cs376Proj
haaaaaabwam

Conflicts:
	.gitignore