week 5 - Chloe
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014
week2 - chloe