...
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
Merge remote-tracking branch 'cmbennett/master'

Conflicts:
	UserInterface/src/edu/ycp/cs320/calculator/client/GameLobby.java