thearn/mao_cadre_2014 — pull request #1 by JustinSGray (2013-11-13 20:46:30+00:00)
Title: merging stuff

I had some conflicts too, from you fixing conflicts. Something funky is going on... try this.