added test2.txt
added fuga line
Merge remote branch 'upstream/master'