conflict simulated
edited
Merge branch 'master' of https://github.com/drdragan/test

Conflicts:
	readme.txt