added charities model, tests, and ability to type in a charity when making a bid
fixed merge conflicts in schema
merge conflict resolved in schema