Adding the second version of PinPic
Doing the test merge