??
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
log
Merge branch 'master' of https://github.com/williamstein/480-ent-2014

Conflicts:
	log.md
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
update DH lecture some more
update based on class