Working on check boxes
fixing merge

Merge https://github.com/HamidM250/S-Ware

Conflicts:
	app/models/volunteer.rb
	db/schema.rb
	db/seeds.rb