изменён:   public/resources/css/main.css
Merge branch 'master' of https://github.com/abxaz92/diplom

Conflicts:
	public/resources/css/main.css
	изменён:   public/resources/css/main.css