Changes to first checkout
Merge https://github.com/savavel/CM1101

Conflicts:
	hello.py