Merge branch 'master' of /Users/Alumne/Documents/PycharmProjects/bank_gest with conflicts.
update
Merge remote-tracking branch 'origin/master'