Conflict solved: mainwindow.cpp and calculate.cpp
[speedfreak] / Client / filereader.h
2010-05-24 Jukka KurttilaFile reader class files added.