The getdata_addfeature function ALMOST works, it might be suboptimal to have it call all the lower level functions, tho. streams_subjinfo now looks for the audio files in a diffrent directory, cos I copied the files there for better organization.
no comment
Merge branch 'master' of github.com:schoffelen/streams

Conflicts:
	matlab/find_donders_and_textgrid_data.m
	matlab/streams_getdata_addfeature.m
Merge branch 'master' of github.com:schoffelen/streams
test commit
not much changed, commented out the function that checks for errors in the get_time_series.m, some other minor unimportant changes
test2, does streams_blp_feature still need merging?
added the files that I copied from JM's folder because it seems that his commit/push did not update them...?
added streams_blp_feature.m
 updated combine_textgrid.m - not working before; Added statfun_xcorr.m ; Updated streams_subjectinfo.m
...
Merge branch 'master' of github.com:schoffelen/streams
turned the streams_stats_test.m into a function and added the script to automate creation of .mat files