initial commit
Merge branch 'master' of https://github.com/mivega/CS247-DP3