Pow-Hash
Merge branch 'master' of https://github.com/vger888/888

Conflicts:
	src/main.h