adding puppy file
Merge remote-tracking branch 'enam/master' into new_branch