Updated master
added testing.txt
Merge branch 'new_branch' of github.com:imagine-it/Testing into new_branch