resolve conflict
Merge branch 'master' of https://github.com/C2R1/Tutorats