changing models again
new branch created while I fix stuff
updating new branch
Merged files
Merge https://github.com/Matt--/S-Ware into Matt

Conflicts:
	app/models/volunteer.rb
	app/views/volunteers/index.html.erb
	app/views/volunteers/show.html.erb
	db/seeds.rb