Changes in master
Changes in testing
Merge branch 'testing'
Added a line to README
Commit for conflict
I merged two branches with a conflict