first commit
testing 2
testing git
Merge branch 'master' of github.com:xhuang3/cs345