test

test
Merge branch 'master' of https://github.com/aliceispig/tinshar_2

Conflicts:
	README.md