First commit
Merge branch 'master' of https://github.com/bjornandersson/punch

Conflicts:
	README.md
Removed trash