Include fixes

Removed comment in .cpp, fixed include in .h
Merge remote-tracking branch 'origin/master' into Micah
Circuit Implementation

Created code for circuit.cpp and circuit.h
Merge remote-tracking branch 'origin/master' into Sirwan