-
Merge branch 'master' of https://github.com/songecko/kfc-fbapp.git

Conflicts:
	index.php