commiting files
changes made to charity files, charity dashboard created and updated charity views
Merge pull request #12 from andredempsey/andrew

changes made to charity files, charity dashboard created and updated cha...
conflict resolution
Merge pull request #13 from andredempsey/nicole

commiting files
resolved merge conflicts with master