css
Merge branch 'master' of https://github.com/Dragonkill/smb-theme

Conflicts:
	style.css
css + translation