updating the final circuit
fixing merge conflict
fixing merge conflict
Merge branch 'master' of github.com:zmcgint2/ece290