Layouting profile's page
Merge pull request #2 from sanzo12/staging

Staging
fixes merge conflicts
declares ruby 2.0.0 on gemfile and uses thin
Try to fix assets on heroku
merge branch master