commit
Merge branch 'master' of github.com:orionzhao/seedT

Conflicts:
	.DS_Store
logo
logo
logo