2nd Commit
First commit
Merge branch 'new_branch'

Conflicts:
	README.md
Fix