Added Virginie's codepen stuff
Fixed first merge conflict