Moving around some stuff
Merge branch 'master' of https://github.com/acgh213/CALCOINS

Conflicts:
	src/calcoinsd
	src/obj/.gitignore