None
Merge branch 'master' of github.com:Zerocoin/zerocoin.github.io

Conflicts:
	software.html