commit
Merge branch 'master' of https://github.com/safrulmunajat/BelajarPHP

Conflicts:
	application/controllers/welcome.php
	application/models/mymodel.php
tamba function