config
fix conflict
fix scroll
Merge branch 'master' of github.com:jlord/open-data-guide