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

Conflicts:
	application/views/admin/Admin_Homepage.php