11
11
Merge branch 'master' of https://github.com/SolarHalo/odds_game.git

Conflicts:
	odds_game/configs/config.php
	odds_game/includes/Administrator.class.php