feature2
Merge branch 'master' of https://github.com/jpavlik/test.git

Conflicts:
	README.md