Merge branch 'master' of github.com:Dehuc/hello_world_stk

Conflicts:
	README.md
Merge branch 'master' of github.com:Dehuc/hello_world_stk

Conflicts:
	README.md