Minor Adjustments
Merge branch 'master' of https://github.com/janetzhu/ap-project4

Conflicts:
	AP Project 4/src/object/Board.java
Delete Prevention Imag
Merge branch 'master' of https://github.com/janetzhu/ap-project4
fast facts title
Merge branch 'master' of https://github.com/janetzhu/ap-project4
Infected with HIV dialog
moved button
Merge branch 'master' of https://github.com/janetzhu/ap-project4
comments on the JUnit testing
Fixed merge conflicts