Merge pull request #112 from CalvinFernandez/hotfix

self.user_id seemed to be causing some null string issues so I removed i...
Merge pull request #113 from CalvinFernandez/master

Added simple api for accessing company data.
Implemented a cleaner way to retrieve Posts and display as JSON
Added Post Jbuilder file
Merged changes
Merge pull request #118 from cvuong/use-jbuilder-to-render-posts

Use jbuilder to render posts
Voting works, for logged in Users and guests, removed public/assets, and changed a setting so we don't precompile assets
Merge pull request #124 from cvuong/voting

Voting works for logged in Users and guests, removed public/assets, and...
Actually show missing.png
Show user picture
Merge pull request #128 from benrudolph/show-photos

Show photos
Fix user photo when not logged in
Merge pull request #129 from benrudolph/fix-user-photo-post

Fix user photo when not logged in
Cleaned up router cruft
Merge pull request #130 from benrudolph/companies-controller

Cleaned up router cruft
Show both fb and user photo if it has one
Cleaned up json builder
Sort posts by number of votes
Merge pull request #131 from benrudolph/show-both-fb-and-user-photo

Show both fb and user photo if it has one
Merge pull request #132 from benrudolph/sort-by-votes

Sort by votes