asdfasf
:q!Merge branch 'master' of https://github.com/shemapi/repoteste

Conflicts:
	readme.txt