Changed figures
Merge branch 'master' of https://github.com/mdbenjam/trianglePainterPaper
And added some more boxes around figures

Conflicts:
	paper.tex