added captions
Merge remote-tracking branch 'origin/master'

Conflicts:
	Paper/fullpaper.tex
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit b04ecce7e6b8c95bc70e4f4aeebf392e69a5b989.