update with tutorial 1
add missing tutorial 1 files
merge conflicts