removes dummy numbers from pages/index.html.erb for Views and Favorites
removes dummy numbers from contents/search.html and users/show icons section
resolve conflict
Merging with Jeff and MiClowe
Merge branch 'master' of github.com:jeffthestampede/cssdash

* 'master' of github.com:jeffthestampede/cssdash:
  Added password recovery email functionality
  modify upload_cloud
fixes login bug devise authenticates user except for :html and :css methods
added postgres gem
Merge pull request #22 from livienyin/master

Fixes logged-out homepage bug and login redirect with Devise
added gem sass and require sass
remove coffee comments from js files
change default gravatar
styling and formatting added to public user profile page
remove public/assets
test wooj.jpg default avatar
changed gravatar default image
add default gravatar png
Merge pull request #23 from livienyin/master

Styling added for public profile page
Merging with master