commit on the test branch
Merge branch 'master' into testbranch

Conflicts:
	README.md
Merge pull request #3 from marcotesta/testbranch

Testbranch