Merge branch 'master' of https://github.com/joehan/6.831

Conflicts:
collection-grid.js