gitignore
Merge branch 'master' of https://github.com/srgg6701/mvc_php

Conflicts:
	.idea/workspace.xml
settings
Модификация роутера.