finished
merging dev into credits
def finised
Merge branch 'credits' into dev