Added St. Maurice stuff and some numbers.
Fixed merge errors.
Merge branch 'master' of https://github.com/asreimer/canorock_phd_2013