Added new shop
Merge branch 'master' of github.com:MMAUG/BF101-API

Conflicts:
	json/shops.json