css
add link to create flat in navbar
Merge branch 'master' into polish
Merge branch 'polish'
resolve conflict