Merge branch 'master' of github.com:tylucaskelley/udacity-api