THREADS AND SHIZNIT

Allowed control to be passed back to the main thread using a countdown
latch.  A game over or game won screen is then displayed and then a
takeaways screen with a replay button
Merge branch 'master' of https://github.com/janetzhu/ap-project4

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
added methods to facts class
Adds text to pain after interval

still need to change what text is added and need to erase sidebar after
game over
Merge branch 'master' of https://github.com/janetzhu/ap-project4

Conflicts:
	AP Project 4/src/object/DisplayPanel.java
Merge branch 'master' of https://github.com/janetzhu/ap-project4

Conflicts:
	AP Project 4/src/object/Board.java
Merge branch 'master'
Fixing merge conflicts
nothing
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
added a comment
Merge branch 'master' of https://github.com/janetzhu/ap-project4
fixing merge conflicts
Fixing merge deletions