Wed Dec 18 21:46:39 MST 2013
Sun Jan 19 21:18:21 MST 2014
Fri Jan 24 08:54:04 MST 2014
Fri Jan 24 10:54:13 MST 2014
Merge remote-tracking branch 'upstream/master'

Merging master with block implementation
Old version preserved in basic_brent

Conflicts:
	subfunctions/core_calc_psd.m
	subfunctions/core_calc_psd_all.m
Thu Jan 30 21:19:29 MST 2014
set density = 10 and winsize = 267
Merge remote-tracking branch 'upstream/master'
winsize settings
Fri Feb 14 10:33:13 MST 2014
changes in settings
Merge remote-tracking branch 'upstream/master'

Conflicts:
	subfunctions/core_get_psd.m
	subfunctions/core_save_psd.m