Created branch 2
Merge branch 'branch2'
Merge branch 'master' of github.com:rockaja/ProjectA