added testfile
Merge branch 'master' into test
#2 added +bug
Merge branch 'master' into test
fixed a bunch of errors