add link
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
Merge branch 'master' of https://github.com/williamstein/480-ent-2014
update log based on class
other stuff, evidently