fixed a bug where the posts page was rendering the user incorrectly
staching changes to prevent conflict
fixed merge conflict with the users controller
Merge pull request #56 from kunovsky/facebook_tests

Facebook tests