Styled profile pages, and fixed linking to profiles and editing profiles
Cleaned up merge conflicts
Merge pull request #31 from dancingshell/Brandon

Styled profile pages, and fixed linking to profiles and editing profiles