changes made to charites controller, model, form
fixing conflicts
Merge pull request #22 from andredempsey/andrew

changes made to charites controller, model, form