test

test
Merge branch 'Matt' of https://github.com/nicholasyoon90/Good-Pet-UI-Revamp into Matt

Conflicts:
	Sam html - Matt Updates/page1.html
	Sam html - Matt Updates/page2.html