framework complete
"changed directories"
Merge branch 'master' of git://github.com/linkenneth/neurosky

Conflicts:
	analyze/processData.py