Login
Merge branch 'master' of https://github.com/pun2345/Dumbobay
Login
Merge branch 'master' of https://github.com/pun2345/Dumbobay

Conflicts:
	application/controllers/home_c.php
Merge branch 'master' of https://github.com/pun2345/Dumbobay
Login
Merge branch 'master' of https://github.com/pun2345/Dumbobay