initial commit
Merge branch 'master' of https://github.com/icicle9/cs496-proj1