commit data source
commit change games controller
commit
Merge branch 'master' of https://github.com/nguyenhan92h/website_hai

Conflicts:
	app/controllers/GamesController.php