pull changes
pull changes
Merge branch 'master' of https://github.com/kelvinmbwilo/NGO

Conflicts:
	.idea/workspace.xml
pull changes
pull changes
pull changes
Merge branch 'master' of https://github.com/kelvinmbwilo/NGO

Conflicts:
	.idea/workspace.xml
	app/config/database.php
	app/views/practices.blade.php
pull changes
pull changes