Adding in merch link
Merge branch 'dev'