Before merge
Merge branch 'master' of github.com:jschear/cs195y-final-project