Updated calculator
Merge https://github.com/aykamko/ResistorReader
Merge branch 'version2' of https://github.com/aykamko/ResistorReader into version2