continue shopping button
Merge branch 'toph'