Heather committing
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014
This is a test.
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014
test commit