Adding nullptr stuff
Merge branch 'gh-pages' of github.com:jtdaugh/xcode-umich into gh-pages