Update big mac and hotel data
Merge branch 'big_mac_hotel_div'
Fix merge conflict and need to redo form