updated import.py with the ability to import data from Serves,Drinks and Bars
Merge branch 'master' of https://github.com/goingpaper/cits2232project

because
merging
trying to push