Merge branch 'master' of https://github.com/McJoshjr/NetworkCoins

Conflicts:
	me/josh/networkcoins/API.java
	me/josh/networkcoins/NetworkCoins.java
Testing new methods