Merge pull request #1 from Justin-Magpie/master

Adding More stuff From Magpie
More things
Merge branch 'master' of https://github.com/Larakin/playtest-pub
Merge pull request #2 from Justin-Magpie/master

Woohoo
Merge pull request #1 from Larakin/master

Getting up to date