Test 3
Merge branch 'master' of https://github.com/alexro/Test

Conflicts:
	readme.md