Merge pull request #5 from orvzjhp/master

With notifications na chi
cutie
Merge pull request #6 from christianbancale/master

cutie
potato
Merge branch 'master' of https://github.com/chichiJPN/ourParish

Conflicts:
	application/views/admin/Admin_Homepage.php
Update mgaKuwang.txt
quiachon
Merge branch 'master' of https://github.com/chichiJPN/ourParish
can add pictures to db
fixed the home body
updated sql 6/15/14 3 46PM
fixed the home body
fixed the home body
updated shtuff
search parish!
search parish!
asdfadf
updated ck editor
updated
updated