original
For github
Merge branch 'master' of github.com:gittan/strip

Conflicts:
	.gitignore