Merge github.com:jybaran/hw

Conflicts:
	Hexadecimal.java