Merge pull request #23 from ApocalypseCoreteam/master

Update branch
Merge pull request #24 from ApocalypseCoreteam/Trial-of-champions

Merge pull request #23 from ApocalypseCoreteam/master