Merge remote-tracking branch 'cloud/master' into newbranch

Conflicts:
	test2.html
Create hello.py
Merge remote-tracking branch 'movila/master'

Conflicts:
	test2.html