svašta novo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Home.php
	assets/css/Home.css
	assets/css/registration.css
Merge remote-tracking branch 'origin/master'
update css