fix merge conflicts and add eye shadow images
add dsstore to gitignore, again, i am not good at time travel