redoing figures!
solving small conflict
Merge branch 'master' of https://github.com/mahrossi/pilepaper

Conflicts:
	text.tex
  changes to text and figures