first commit
Merge branch 'master' of https://github.com/shibai/cmpe283_project_1