Some Style changes
Changing Product Grid folder name
removing test file for so.css
Fixing branch structure
Trying to fix merge issue