edit on the new branch.
new file
Merge pull request #1 from agdm/testbranch

new file
adding my own timestamp on your thing. Thanks.
Merge branch 'master' of https://github.com/hectorleiva/test1 into testbranch

Conflicts:
	README.md