some stuff added
Merge branch 'master' of github.com:JustinSGray/mao_cadre_2014