Get the whole dolphin-randomization shebang working
Merge branch 'master' of github.com:PermuteSeminar/PermuteSeminar-2014

Conflicts:
	Week-5/sam_script.R