small edits, again
small eidts
Merge branch 'master' of https://github.com/TheoT/CircuitsFinal