fileio and programming comp prep
Merge branch 'master' of https://github.com/violetteavi/ApCompSci.git

Conflicts:
	Classwork/classwork/rubiksmath/RubiksCalc.java
	Classwork/classwork/rubiksmath/RubiksCalcTest.java