init
Merge branch 'master' of github.com:st688/ext

Conflicts:
	.gitignore