Test code update
Merge branch 'master' of https://www.github.com/acgh213/CALCOINS

Conflicts:
	src/calcoinsd