Merge branch 'gh-pages' of https://github.com/drewk2525/dws1 into gh-pages

Conflicts:
index.html
index.html~
updated index.html
Merge branch 'gh-pages' of https://github.com/drewk2525/dws1 into gh-pages

Conflicts:
	index.html