Merge in changes to Git intermediate lesson
Merge branch 'ahmadia/merge-git-intermediate' into 2014-05-23-csdms