Merged feat

Merged Styling and Authentication and Database