pushed update to branch Janet
Merge branch 'Alex's-Branch'
Merge branch 'Alex's-Branch'
Minor changes to Board method names
Merge branch 'master' into Janet

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
	AP Project 4/src/object/Board.java
Merge branch 'Janet'
removed unneeded methods
fixed conflicts
fixed conflicts in method names

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
	AP Project 4/src/object/Board.java
added buttons to option panel
changing option panel to black, partially constructing background window
made new classes for all the separate JPanels

also added bg and logo images
added buttons and listeners

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
fixed repaint
I added a textbox with the background informatio
removed option panel, fit everything in window
Merge branch 'master' of https://github.com/janetzhu/ap-project4

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
merged changes
i also added the textbox for the procedures on how to play the game
minor changes to Board and main file