committing
committed 2 pgms
"config file"
"new config"
Merge branch 'master' into dev

Conflicts:
	config.php