Side menu
Resolving conflicts
Merge pull request #8 from AntJanus/feature/side-menu

Side menu