Merge pull request #37 from pbyrne222/master

shifts type added to shifts index view
added logic to controller for all shift types
Merge branch 'master' of https://github.com/SEEDlings/clipboard
Merge pull request #38 from rlconley/master

Logic for all shift types
fixed view shift type double render