delete
final2
Merge branch 'gh-pages' of https://github.com/konsherman/Repository-1 into gh-pages

Conflicts:
	sherman_konner_final/final.html
delete
resub