asdasd
Merge branch 'master' of http://github.com/starshiner/helloword

Conflicts:
	documary