Testing local Secondary-Branch -- variables added
Merge branch 'master' into Secondary-Branch

Conflicts:
	Classes.cpp