Admin dashboard design almost complete
Prebeta of shop design
Node modules in gitignore
Node modules in gitignore conflicts fixed
Merge branch 'frontend'