merge
Merge branch 'master' of https://github.com/dextorer/MHDParis2014
added slack
Merge branch 'master' of https://github.com/dextorer/MHDParis2014