stuff
Merge branch 'master' of https://github.com/MyPlanetFruitloops/PinkGrapefruit
multiple changes.