initial stuffs
conflicts
menu dropdown
Merge branch 'master' of https://github.com/przekogo/wypociny