put all my codes together
Merge branch 'master' of https://github.com/jenhantao/UCSD_IGEM into Kt-Er

Conflicts:
	.ds_store
	CircuitNetwork/src/pydoc_template.py
	considerable/lab.ipynb
	considerable/template_pydoc.py
	kwat_scripts/lab.ipynb
	kwat_scripts/template_pydoc.py
	kwat_scripts/tester.ipynb