ViewController updated
Merge branch 'master' of https://github.com/selpheric/Calc