adding styling before merging branches
merging with master hopefully with styling and auth
merged with auth