made chages to the charity dashboard and login
resolved conflicts
Merge pull request #10 from andredempsey/andrew

made chages to the charity dashboard and login