GitIgnore stuff...
Updates to this post.
Merge remote-tracking branch 'origin/master'