Final commit
Fixing merge

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

Conflicts:
	app/controllers/volunteers_controller.rb