Merge remote-tracking branch 'upstream/master'
Create Users controller
fix conflict with schema.rb
Merge pull request #23 from rpandey1234/master

Add user profile page
Fixed stylesheet order error
Set up partials for a Glimpse
Merge remote-tracking branch 'upstream/master' into create-home-page
Merge pull request #26 from cvuong/create-home-page

Lay down the foundation for the home page
Can now create new posts by sending image to path. Test included!
Resolved routes conflict
Changed the filler text
Merge remote-tracking branch 'upstream/master' into create-home-page
Merge pull request #27 from benrudolph/handle-image-from-android

Can now create new posts by sending image to path. Test included!
Merge pull request #30 from cvuong/create-home-page

Change the Glimpse partial to include more info
Change the root view
Merge pull request #35 from cvuong/change-root-view

Change the root view
Changed Gemfile to install quiet_assets gem
Merge pull request #37 from cvuong/silence-assets

Changed Gemfile to install quiet_assets gem