some stuff added
Merge branch 'master' of github.com:JustinSGray/mao_cadre_2014
Merge pull request #2 from Kenneth-T-Moore/master

beginnings