numeric
removing ystockquote
resolving conflict by taking recent versions
Merge branch 'master' of github.com:jonathan-taylor/stats-lecture-notes

t log
added a new normal table