fixing merge conflicts
Merge branch 'master' of https://github.com/janetzhu/ap-project4

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