lightening up that black in class 1
Merge branch 'test2'
Added a new id
darkening up that white
Added a new id
added something else
Revert "added something else"

This reverts commit f1bd855d23dd3d340f3794c5e1526ba611339d35.
added something else
Merge remote-tracking branch 'origin/test2'
something
something
Fixed the clash