Edit almost complete
Merge branch 'master' of https://github.com/Yfirmoddarar/Textaland