commit 3
commit 3
commit 3
merge commit
merge commit with style
merge commit with style
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	config.js
	controllers/site.js
	static/css/style.css
	views/html/cabinet.html
	views/html/index.html
	views/html/main.html
	views/html/requests.html