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