refactored sfcreate method to remove duplicative new_shift creation
fixed merge conlficts
removed deleted files from git and fixed merge conflics
Merge pull request #41 from rlconley/master

Refactored sfcreate method