Testing git commit
Merge branch 'master' of https://github.com/adwilk/hackpack

Conflicts:
	README.md