Merged with Jesse's changes
Trying to make dense matrix
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
changed to pull