update?
Merge branch 'master' of https://github.com/alexjwong/logic-simulator

Conflicts:
	gate.cpp