initial commit (mixture)
auto commit (mixture)
Fixed conflicts and removed the Sketch file
Removed duplicate files
Fixed conflicts