new images, changed facts a little
fixed conflicts

Conflicts:
	AP Project 4/src/object/DisplayPanel.java
	AP Project 4/src/object/Facts.java