I did what John told me to do.
Merge branch 'Johns_Branch' into James'sBranch

Conflicts:
	README.md