Fix syntax in inherited object definitions
Fix merge conficts
Merge branch 'master' of https://github.com/alexjwong/logic-simulator