fixed untracked files
Merge branch 'master' of https://github.com/srgg6701/mvc_php

Conflicts:
	.gitignore
	.idea/workspace.xml
config
25 again
?
config
fixing .gitignore encoding
Merge branch 'master' of https://github.com/srgg6701/mvc_php

Conflicts:
	app/controller.php