test commit
test commit from local machine
fixed misbehaving config file
test commit
updated resources pages
spellchecker defaults to on
Merge branch 'master' of github.com:noslouch/shanghai-home
Merge branch 'master' into develop