documentation
Merge branch 'master' of git@github.com:jhprinz/msm-tis.git