Initial branching info
updated master
Merge branch 'testing'
Added merging