Merge branch 'master' of C:\Users\kiki__000\Desktop\CineMetro with conflicts.
general commit