include content
resolve merge
add final content
nav on other pages
fix micro bug
Merge branch 'master' of https://github.com/osylvain/pro-peinture
add google analytics
footer on other pages
footer on all other pages
nav on all other pages
Merge branch 'master' of github.com:osylvain/pro-peinture
fix footer