3st local commit
4st local commit
Merge local with remote

Conflicts:
	README.md
new local commit
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	README.md