Added test1
Added test2
Additional commit on master
Merge branch 'test'