we started
Merge branch 'master' of https://github.com/palmerlao/CS452-PROJECT1
put base code in