Added pick and place, simple_head, cup files
 merge