ScrambledEgge101/TrickyNinja — pull request #17 by ScrambledEgge101 (2014-03-07 00:48:12+00:00)
Title: Merge pull request #16 from ScrambledEgge101/master

Merge pull request #15 from ScrambledEgge101/Jason2