upd
Merge branch 'master' of https://github.com/coderiver/vetcentr

Conflicts:
	css/screen.css
	img/icons-s548d439337.png
	img/icons-se1cdf80e54.png