abhishek0647/fs-project — pull request #14 by abhishek0647 (2014-05-19 20:41:22+00:00)
Title: Fixed merge conflicts for homepage

Fixed merge conflict
Updated css and content for homepage