Merge branch 'master' of https://github.com/petereast/variables.git

Conflicts:
	helloworld.py
Merge branch 'master' of https://github.com/petereast/variables.git