changed gitignore to ignore Photoshop files
fixed layout for better responsive layout
fixed layout for better responsive layout
fixing merge issues