borders
Merge branch 'master' of https://github.com/svenzaimovic/drugakuca

Conflicts:
	frontend/css/style.css