Fixed stuff! GOD DAMNIT COMP!
Tried to fix Comp's shit
Merge pull request #21 from poppypoppop/dev

Dev