Trying to resolve conflicts with Fig. 1B
Merge branch 'master' of https://github.com/bernhardsteiert/fda

Conflicts:
	FOXO3a_figures/figure_1b_btctraces.m