Got rid of generated files, and modified prog1
Merge branch 'master' of github.com:oraac/ewu-cscd540