add new comment
add point
add comment
conflict
Merge pull request #7 from sampayo/last-test-branch

add point