fixed a few things
began adding scope and visibility tutorial
fixed merge problem in fonction.txt
fixed merge conflict