added test1
new temp folder
Merge branches 'master' and 'newBranch'