I don't even know what I'm looking at.
That wasn't supposed to be there..
Merge pull request #1 from KittyTristy/working

Merge Working branch to Master branch