made a change
Added master.md
Hotfixed
Something added
Merge branch 'testing'
Conflict.md added
Added content
Conflict edited
merged
Added
Merge branch 'master' of https://github.com/tomkowz/test-ch2

Conflicts:
	master.md