first commit for tog
Merge branch 'master' of github.com:Liujiesu27/tog

Conflicts:
	.gitignore
add gitignore