Added an ini file that contains the database connection info
Merge origin/master

Conflicts:
	operations.php