Created a line to cause a merge conflict in rewriting-the-future
Merge branch 'rewriting-the-future'

Conflicts:
	bio.md

Resolved by having the two sentence follow each other in order.