Commit

Meow
Merge pull request #1 from Phalanxia/master

Lots of code