Solved merging conflicts with test_zam347-branch.

.gitignore

Zam347_scripts/generate_era5.sh

Zam347_scripts/train_era5.sh

bash/workflow_era5_macOS.sh

bash/workflow_era5_zam347.sh

env_setup/create_env_zam347.sh

hparams/era5/model_hparams.json

hparams/kth/ours_savp/model_hparams.json

scripts/generate_transfer_learning_finetune.py

scripts/train_dummy.py

video_prediction/datasets/era5_dataset_v2.py

video_prediction/layers/BasicConvLSTMCell.py

video_prediction/layers/layer_def.py

video_prediction/layers/mcnet_ops.py

video_prediction/models/__init__.py

video_prediction/models/mcnet_model.py

video_prediction/models/savp_model.py

video_prediction/models/vanilla_convLSTM_model.py

video_prediction/models/vanilla_vae_model.py

video_prediction/utils/mcnet_utils.py