more css
fixed merge conflicts
css to profile.erb
fixed merge conflicts
Merge pull request #20 from WhaleMonster/michelle

Michelle