update to the file
update 1
next
Merge branch 'test_2' of https://github.com/ksherre1/test_1 into test_2

Conflicts:
	game_database/includes/classes/db.class.test.php
Merge remote-tracking branch 'origin/test_2'