Add a line
Merge branch 'master' into anikoska/test

Conflicts:
	README