working on layout of products view
added the view file
Pull and resolve conflicts in local.xml
Finished wireframe for products pages
Pull dev and resolve conflicts.
changed the general color and changed the logo
Merge branch 'custom-home_page' into dev
resolved conflict from csv local.xml