Merge branch 'master' of github.com:jsha/blocktogether
Handle null user in findAndUpdateBlocks
Merge pull request #109 from BooDoo/issue/108/fix-update-blocks

Handle null user in findAndUpdateBlocks
Merge branch 'master' of github.com:jsha/blocktogether
Merge branch 'master' into block-diffs

Conflicts:
	update-blocks.js