this is cool for the second version
Merge branch 'testing'

Conflicts:
test.txt
this is great

this is really great if committed
Merge branch 'master' of https://github.com/anandsunku/Firstone