Changing figures as suggested by DM
  conflicts...
Merge branch 'master' of https://github.com/mahrossi/pilepaper

Conflicts:
	data/zundel_lowfreq_100K.agr
	figures/zundel_lowfreq_100K.pdf
  more figures