Added code that kills the pet after it has not eaten och walked for a certain amount of time
fixed merge conflict