new stuffs
	modified:   main.py
Merge branch 'master' of https://github.com/g-font/example

Conflicts:
	main.py