gitignore
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/pandahitam/infolapangan
no message
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	index.php
update frontend home
Merge branch 'master' of https://github.com/pandahitam/infolapangan

Conflicts:
	protected/config/main.php