changed some method names
resolved conflicts

Conflicts:
	AP Project 4/src/impl/InvasionGame.java
fixing merge conflicts