some commit thingy
resolving conflict

Conflicts:
	CarSharePhp/carshare/include/database.php