foo
Merge branch 'master' of https://github.com/JustinSGray/mao_cadre_2014
fixed bug in bib