pielabots dizains login lapā
Merge branch 'master' of https://github.com/dpitkevics/mafia

Conflicts:
	css/main.css
	views/layouts/main.php