added favicon
resolved conflicts
css scroller tweak
rough user profile page
Merge pull request #30 from dontmitch/user-profile-page

User profile page