A try to fix an error
Merge branch 'master' of github.com:sofiase/ReadyForAPet
Preparing for savings
Fixed merge