start p3
Merge branch 'master' of github.com:uzuri/cscie15-p3