almost there
Merge branch 'master' of https://github.com/Cfretz244/Oh-Shit