touched up My Profile Styles
fixed some conflicts
empty commit
fixing merge issues