added stuff
first commit of test1.txt
first commit of test2.txt
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/darren-trx/testing