finised assignment 1
Merge branch 'master' of github.com:jmccartie/cs193p-fall_2014