Merge pull request #3 from hirunatan/master

Some more changes
Text edition on mereth aderthad guides
Merge branch 'master' of https://github.com/Erengalad/estelcon_web
Members foto changed
Merge pull request #11 from Erengalad/master

Members photo edit