everything modified/added
Merge branch 'master' of https://github.com/deadlypanda4/osp

everything