new class/old class changes
Merge branch 'master' of https://github.com/anniemeng/anniemeng.github.io

Conflicts:
	pennapps2014/StartingClass.java