finished
merging dev into credits
def finised