test stg
test dev
Add versionning in index.html
resolving merge issue
index.thm
resolved merge conflict
Fixing bugs with row fluid and alt for pictures
Merge branch 'dev' into staging
Add google analytics and social button from addthis
Merge branch 'dev' into staging