Text edition on mereth aderthad guides
Merge branch 'master' of https://github.com/Erengalad/estelcon_web