commit before merging master to local
merged conflicts
finished sign-in and sign-up styling. Began profile styling