Final file for my rep
Merge branch 'master' of https://github.com/jcarrharris/collaborative_writing
Merge branch 'master' of https://github.com/jcarrharris/collaborative_writing