Solved Merge conflicts
Merge pull request #36 from fsbatista/master

Improved Feed and Project section (Box Shadow )