I had to resave this because it's not letting me commit my modifying changes.
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014