it works (sortof)
Merge branch 'master' of https://github.com/dextorer/MHDParis2014