git push -u origin master
Merge branch 'master' of https://github.com/epcalambro-mobext/malayan

Conflicts:
	application/views/home_view.php
git push -u origin master