Etherpad from SFU Software Carpentry Bootcamp June 6-7 2013
Merge branch 'master' of https://github.com/LJWilliams/git-project