Again????
Merge branch 'master' of https://github.com/fionawood/zabawa

Merging
Fixed weird bottom bar badge error~~~
Fixed overflow/scrolling
fixing