Aaron and Todd...added subsystem damage logic.
Merge remote-tracking branch 'origin/slep' into slep

Conflicts:
	src/test/java/Tests/TestShields.java
Aaron and Todd...added subsystem damage logic.
Merge remote-tracking branch 'origin/slep' into slep