Merge pull request #5 from johnt447/master

Update with new circuits from john
no pyc files
asd
asd
Update .gitignore
Corrected And and Not
test
test