updating chips state
Merge branch 'master' into eric_dev

Conflicts:
	src/chips/logic/chip.cpp
changes chip
Merge branch 'master' of github.com:EricWF/chips