more updates
Merge branch 'master' of https://github.com/tfarlow/rally

Conflicts:
	DollarsToWords.jar