Merge pull request #29 from ataro24/merge_test

add pic info and ending
add new data