profile page css/html refactored
edit_profile page css refactored
login page css refactored, and minor changes in user_html
registration page css refactored, minor changes to login css
friends page css refactored
freinds page css refactored
finished off css refactor for now, side nav could still be tinkered with, but not urgent
fixed merge conflict