test
Merge branch 'DD2' into DD1

Conflicts:
	game_database/database_conn.php