conf
Merge branch 'master' of https://github.com/richard-1990/projects

Conflicts:
	mvc/config/config.php