more pirateering
Merge branch 'master' of https://github.com/kebian/Piratecoin

Conflicts:
	src/main.cpp