comment
fixed bug when training and test data was the same
Merge branch 'master' of github.com:vzaliva/touchsens

Conflicts:
	analysis/data_prep.R