Completed testUpdatePosition jUnit
Changed GameList_Test to GameList
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/Game_Selection.java
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/Game_Selection.java
Merge remote-tracking branch 'cmbennett/master'
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/Game_Selection.java
Commented out the code we no longer need in the move players portion of
RocketPadsPlayer and the related Test.  Kept it in case we decide to use
it later.
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	Calculator2/JUnit/edu/ycp/cs320/calculator/shared/RocketPadsPlayerTest.java
Dr. Hovemeyer added the class RocketPad and wants us to put back some of
the game logic that includes how the pads actually move the characters
(by incrementing and decrementing the X and Y axis).
Loaded all of the images with UserInterface.getImage("");
...
Moved RocketPadsGame and RocketPadPlayer to the problem domain area.
Merge remote-tracking branch 'cfinch2/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsGame.java
	UserInterface/src/edu/ycp/cs320/calculator/client/RocketPadsView.java
BACKGROUND YAY
...
Merge branch 'master' of git@github.com:cmbennett/Calculator2.git

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/UserInterface.java
fix build path
Merge remote-tracking branch 'origin/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/GameLobby.java
	UserInterface/src/edu/ycp/cs320/calculator/client/RocketPadsView.java
added empty whitespace to .classpath
Merge branch 'master' of git@github.com:cmbennett/Calculator2.git