updated contents
updated test
Merge branch 'master' of https://github.com/telnet2/gradworks

Conflicts:
	interviews/dsmain.cpp
	interviews/glmain.cpp
	interviews/glmain.h