before merge with Alex's
After pull, merge failed
committing before Caroline
Commiting changes?
seed file added
Amending .gitignore
After merge with develop