Merge pull request #6 from PhoenixTeamMC/testing

Trying to fix stuff
Merge pull request #7 from PhoenixTeamMC/master

Trying to fix stuff