add today
Change README.md
Change my to your
Merge branch 'new_branch'

Conflicts:
	README.md
Fix conflict