GUNTHER EATS STUFF
solved conflict
added new images