nhknjk
ngfhfg
Merge branch 'master' into smarijus

Conflicts:
	Readme.txt

gdfgdff