update
Merge branch 'master' of https://github.com/redyyu/tinpico

Conflicts:
	.gitignore