Merge remote-tracking branch 'cmbennett/master'

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

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/GameLobby.java
Merge remote-tracking branch 'cmbennett/master'
Merge branch 'master' of git://github.com/cmbennett/Calculator2
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsDirection.java
Merge remote-tracking branch 'cmbennett/master'
removed WIN enumeration member from RocketPadsDirection
Manually copied files from cmbennett
Need to repull.
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	Calculator2/JUnit/edu/ycp/cs320/calculator/shared/RocketPadsPlayerTest.java
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsController.java
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsGame.java
	Calculator2/src/edu/ycp/cs320/calculator/shared/RocketPadsPlayer.java
	UserInterface/src/edu/ycp/cs320/calculator/client/GameLobby.java
	UserInterface/src/edu/ycp/cs320/calculator/client/RocketPadsView.java
Merged with cmBennet's changes.
Merge remote-tracking branch 'cmbennett/master'
Merge remote-tracking branch 'cmbennett/master'
Commit to pull. Switching to single player.
Merged successfully with Colin.
Added two new boards.
Updated RocketPadsPlayerTest for full coverage.  Started
RocketPadsControllerTest, not yet complete.
SQL Database