more outlining
author order
Merge branch 'master' of github.com:thearn/mao_cadre_2014