joined guild recieved cake
Merge pull request #10 from christianulf/gh-pages

joined guild recieved cake
fixed description
Merge pull request #12 from zl222ag/gh-pages

fixed description
completed phase 0 recieved cake
completed phase 0 v1.1 recieved cake
Merge pull request #13 from christianulf/gh-pages

completed phase 0 recieved cake
fixed conflict