changes
merge
Merge branch 'master' of https://github.com/sudov/okra
Merge branch 'master' of https://github.com/sudov/okra
Merge branch 'master' of https://github.com/sudov/okra
merge conflict with new tab css
static/css/new_tab.css change