first week
Merge branch 'master' of github.com:jingcmu/Geophone

Conflicts:
	python/serialthread.py