some chages in hallo.file
test.txt -->test2
Merge branches 'qwert', 'test' and 'test2' into development