WTF??
Merge branch 'master' of https://github.com/bodhibroy/bumpyNames

Conflicts:
	frontEnd/js/controlCoins.js