First pass at linking
Merge branch 'master' of https://github.com/leckster/cs256

Conflicts:
	log.html