merged pow
pow fix
Merge branch 'master' of https://github.com/kata124/CSE12_HW8

Conflicts:
	Quantity.java