fix borders
fixed conflict in css
Merge branch 'master' of github.com:godot/poromodoromodo