cleaning up git mishap
Merge branch 'develop' of github.com:steelhawks/ProjectShifter into develop