Merge
Merge remote-tracking branch 'origin/team1-edit-iterations' into team1-edit-iterations
Adding media files to last commit
Changes to editing iterations.