removed files from list that aren't needed anymore
Merge branch 'master' of https://github.com/deadlypanda4/osp4