sam's attempt at the dolphin thing
Merge branch 'master' of github.com:PermuteSeminar/PermuteSeminar-2014