Fixed all the merge errors
Merge branch 'master' of github.com:zadenikt/CorruptionOfChampions
Update README.md