Merge branch 'master' of https://github.com/borghenry/WinterSchool2014
Merge branch 'master' of https://github.com/borghenry/WinterSchool2014