add about+join pages
merge conflict