Merge branch 'master' of https://github.com/cranberryofdoom/hackduke

Conflicts:
	index.html
merge conflicts fixed