Applied some OO conventions.
Merge branch 'master' of https://github.com/hasswel/SimpleCalc.git