merge?
Merge branch 'master' of ssh://git@github.com/BlueprintDevTeam/paritaire.git