First commit
Merge branch 'new_branch'

Conflicts:
	README.md
Change 'my' to 'the'
Merge branch 'new_branch'

Conflicts:
	README.md