Add ShopListAdapter
Fixed git conflict at MainActivity