new branch
Merge remote-tracking branch 'origin/master' into dev/mathias
Merge remote-tracking branch 'origin/master' into dev/joel-2
create index
Merge branch 'master' of https://github.com/comem/rockit
change joel.txt
add bob
Merge remote-tracking branch 'origin/master' into dev/joel
add boostrap.php
Revert "Merge branch 'dev/christian'"

This reverts commit 138dc0f491fef4ed5cfe9f90a9d363f250a44d8a, reversing
changes made to 393ebccaa8bf082f22f534d01455cd385e8667b3.
Revert "Add for coucou.php"

This reverts commit 68f4da4a7cdefa24064aa25988b0d67a9e965e57.
Merge branch 'master' into dev/christian