Merge pull request #8 from FalseNight/master

Merge from my Repo to Master Repo
Fix Tyler's shitty code + add mine
Fixed Aaron's shitty code
done.... i think?
My shitty code

oh god pls wrok
Merge pull request #5 from Heart-of-the-Cards/master

I need Aaron's Code