fixed calculatortestprogram.cpp
Merge branch 'master' into thomas