added line to mergemeplease
Merge branch 'master' of https://github.com/FdV-Scientific-Computing-2014/planets-concensus