include content
resolve merge
add final content
fix micro bug
Merge branch 'master' of https://github.com/osylvain/pro-peinture