Added Connie Wen
Fixed merge conflicts
Fixed more merge conflicts
Fixed merge conflicts
Fixed merge conflicts
Fixed merge conflicts