created 50 chars, first & last names for seeding
created a new charity view to display all chars
seeded new data
fixed conflicts

Merge branch 'master' into andrew

Conflicts:
	app/controllers/CharitiesController.php
	app/views/layouts/master.blade.php
Merge pull request #37 from andredempsey/andrew

created 50 chars, first & last names for seeding