Merge pull request #9 from FalseNight/master

Fixed EVERYTHING and did Aaron's Job
Oh god why

god why pls god why
Merge pull request #6 from Heart-of-the-Cards/master

Update my Repo