Som pridal hviezdicky, ktore aj tak zmazeme
Merge branch 'master' of github.com:r3dr1f/Online-Radio

Conflicts:
	project/project/static/stylesheets/screen.css