...
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 'cmbennett/master'