Gregoire is attacking us!!!
Merge branch 'foo'
Merge branch 'master' of amadanmath/calc
Merge branch 'master' of amadanmath/calc