test commit
test merge
test2
Merge remote-tracking branch 'origin/jing'

Conflicts:
	abc
Merge branch 'jing'
added log and arff saved to sd card.
Merge branch 'jing'
Adding columns in DB to record typeOfInput and timeTaken
Fixing timer issues, Adding button to start timer
Merge branch 'per'
Merge branch 'jing'
commit before changing feature constructor.
changed to 6 states.
for testing page skip recording before and after 5 sec of state changes.
add old classifier file.