Merge pull request #42 from ApocalypseCoreteam/master

Update branch
Merge pull request #43 from ApocalypseCoreteam/TrialOfChampions

Merge pull request #42 from ApocalypseCoreteam/master