the file that describes the discretization and some of the numerics
Merge branch 'master' of https://github.com/mkachanovska/cemracs2014
Merge branch 'master' of https://github.com/mkachanovska/cemracs2014
fixed a couple of bugs