Merge pull request #3 from andredempsey/nicole

Nicole
basic user registration; revised migrations and models
fixed references to join table in Users and Charities models
set up the form for charities sign up
code is currently unfinished and pushing to get master up to date
Merge pull request #4 from andredempsey/andrew

end of day merge to get everyone on same page
adding files