merge changes
Merge branch 'master' of github.com:mixan946/knolage_base

* 'master' of github.com:mixan946/knolage_base:
  верстка