modified:   includes/class.mysql.php
	modified:   includes/class.mysql.php~
	modified:   includes/settings.yml
	new file:   includes/settings.yml~