adding for merge
migrations table for adding twitter oauth tokens
parital ajax implementation on user dashboard; interim commit
changes made to charites controller, model, form
Merge pull request #21 from andredempsey/andre

Andre
fixing conflicts
Merge pull request #22 from andredempsey/andrew

changes made to charites controller, model, form
adding for merge
resolving conflicts
Merge pull request #23 from andredempsey/nicole

Nicole
resolving merge conflicts