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