add gaelle.txt
add my name
fix conflict
Merge branch 'master' of https://github.com/rails-school/roster