Added ETCalc project files
fixed merge problem