gemfile rearragned but fine
Merge branch 'master' of https://github.com/SEEDlings/clipboard
Merge branch 'master' of https://github.com/SEEDlings/clipboard
modified fixtures
client action moved and testaction created
updated fixture files per David
Merge branch 'master' of https://github.com/SEEDlings/clipboard
setup basic form partial
Edited form partial
generated shifts view and controller
updated testaction method in volunteers controller
correctly selects and displays names for todays shifts
added before action and modified confirm method
tweaked merge conflict
manipulated shifts controller to render confirm action in views
fixed merge conflicts in routes and shifts controller
all shift status added to shifts index
merge conflict changed volunteer controller action from index to new
tweaked app js erb file
Merge branch 'master' of https://github.com/SEEDlings/clipboard

Conflicts:
	app/controllers/home_controller.rb
	app/views/shifts/index.html.erb