Merge branch 'master' of https://github.com/quinnhosler/Shiftr2Work