added shift type dropdown to view
added shift type as text box to main view
fixed merge conflicts
Merge pull request #36 from rlconley/master

Added text box for shift type