Update merchantpage.html
Update merchantpage.css
Update master.css
Merge pull request #1 from blainefricks/staging

Staging