aligned page and timer
Merge pull request #17 from cmarkel5/shop_styling

aligned page and timer
about page done
Merge pull request #18 from cmarkel5/about_page

about page done
signup signin styling
Fix merge conflicts