Merging fosterer with volunteer
merge fixing
Merge https://github.com/HamidM250/S-Ware

Conflicts:
	app/models/volunteer.rb
	app/views/fosterers/_form.html.erb~
	app/views/fosterers/index.html.erb
	app/views/fosterers/index.html.erb~
	app/views/fosterers/new.html.erb~
	app/views/fosterers/show.html.erb~
	app/views/volunteers/_form.html.erb~
	app/views/volunteers/index.html.erb
	app/views/volunteers/show.html.erb
	app/views/volunteers/show.html.erb~
	db/migrate/20130821041532_create_volunteers.rb~
	db/seeds.rb
fixinng error