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

Conflicts:
	css/screen.css
	img/icons-s5cfb58cf9f.png
	sass/screen.sass