Merge branch 'master' of https://github.com/phamducphong/Repo
Merge branch 'master' of https://github.com/phamducphong/Repo

Conflicts:
	baking