uncommited file

d q lam kung cnu gumalaw bka val
Merge remote-tracking branch 'origin/master'

Conflicts:
	front/template/ia.phtml