page4, ChangeStudyBasis,
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineAbit.Designer.cs