First addition to master, 5th commit overall
Merge (--no-ff) branch 'master' into second. There was a conflict that I fixed, but this was a merge with --no-ff

Conflicts:
	README.md