started nav fixes
resolved conflicts
making profile page show charts
resolved conflicts
resolved conflicts
removed junk from user profile
Merge pull request #63 from brucetoddlee/removed_conflict_notice

removed junk from user profile
Merge pull request #64 from ydarbleoj/css_stuff

more css changes
removed junk from style.css
Merge pull request #65 from brucetoddlee/removed_conflict_notice_css

removed junk from style.css
more css changes