...
...
Merge remote-tracking branch 'origin/master'

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

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