Coincident SuperCHAMP.
?
Fixed merge conflicts.
Merge branch 'master' of https://github.com/asreimer/canorock_phd_2013