Betabay's changes
Merge branch 'master' of https://github.com/jeremiahlee/demo-repository

Conflicts:
	index.html
took out jeremiah's content