Style changes
Merge branch 'master' of github.com:minghan/snapworld

Conflicts:
	python/master.py