Stupid DS_Store
Merge branch 'team_blue' of https://github.com/flatiron-school/002.students.flatironschool.com into team_blue
More changes
Merge branch 'team_blue' of https://github.com/flatiron-school/002.students.flatironschool.com into team_blue