Forgot to pull so now merging
Merge branch 'master' of github.com:VDalibard/MaxEnt