added two files
added first file to testin
Merge branch 'master' into testing