Added animations in the slides.
Added modifications in order to create a conflict.
Merge branch 'master' of github.com:ClementGGuy/toyrepo