Merging with the branch
Merge conflicts galore
Merge branch 'master' of https://github.com/Sy4z/The-Excellent-Adventure