getting main to compile
Merge branch 'master' of https://github.com/dlwcarr/CS343-A6