discipline layout
discipline layout
Merge branch 'master' into gh-pages

merging to gh