Fixed all of the stuff that Git screwed up.

Put back Armor.java, put all of the white armor in the correct place,
put the zombie images back, and put the item images back.