Updates refactoring of nv as numVariables
Updates functions to be more readable
Extracts function to add current variables
Merge branch 'master' of github.com:dhiana/mna

Conflicts:
	src/circuits/circuit.cpp
Merge branch 'master' of github.com:dhiana/mna