Merge remote-tracking branch 'origin/for-the-win' into for-the-win

Conflicts:
	Classrooms/gen/com/classrooms/R.java