Delete file that I renamed and it didn't track correctly
Merge branch 'master' of https://github.com/woodsb/WorkingNoms