Adding Adam in the place of Jeremiah
Merge branch 'kazwell'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/jeremiahlee/demo-repository