commit file1 and 2
Added new line
Merge branch 'master' of https://github.com/aceybunch/test into test_branch