Fixed Borders
Merge branch 'master' of https://github.com/MyPlanetFruitloops/PinkGrapefruit