merge fix
Merge branch 'psuedo_master' of https://github.com/thomt/Innutrac into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/PercentCard.java