Small Change
Merge remote-tracking branch 'colin/master'

Conflicts:
	Calculator2/src/edu/ycp/cs320/calculator/Main.java
Floor Frame & Floor Panel
- Renamed Frame and Panel classes
- Updated RocketPadsPLayer class