fixed merge conflicts pt 1
Merge branch 'master' of https://github.com/aletty/shwastinator-server
Merge branch 'master' of https://github.com/aletty/shwastinator-server
merge fixes
dependcy
dependcy
fixed navbar