First commit
First Step  Merge branch 'master' of https://github.com/berga90/calc_proj