file.txt HAS been added
Merge branch 'master' of github.com:downpatrik/Diaweb