Edited the shop.php to fix the dodgy navigation bar behavior
Merge branch 'master' of github.com:ChasePlaysMC/SoloGeekSite

Conflicts:
	shop.php