para kay kon
Merge branch 'master' of https://github.com/christinebalili/dlab

Conflicts:
	application/controllers/welcome.php
Merge branch 'master' of https://github.com/christinebalili/dlab
para kay kon