This is a commit in parallel with another project.
Merge branch 'origin/master'

Conflicts:
	README.md

Merged the contents of both files.