changes
changes
Merge branch 'master' of github.com:rustamaliyev/landlord

Conflicts:
	public/css/style.css