class september 25
Merge branch 'master' of https://github.com/songela/apcs1415

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Topic 1 - Java Basics/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/54725489.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/version.ini