first commit
Merge branch 'master' of github.com:mcgoooo/pinch

Conflicts:
	.gitignore