logo + new button style + join-page
Merge pull request #12 from bechi/feature/join-page

logo + new button style + join-page
fix conflicts