Edits
Further revisions
Merge branch 'ArticleAddition'

Conflicts:
index.html
Merge branch 'master' of https://github.com/andrewhaw/tutorial

Conflicts:
	index.html