WS
Merge branch 'master' of https://github.com/fomics/SummerSchool2014