Adds test2.txt and modifies test1.txt on demo1
Adds test4.txt on demo1
Merge branch 'demo1'
Adds test5.txt to demo3
Adds demo4.txt to demo4
Merge pull request #4 from stefanthaler/demo4

Demo4