updates to paper
fixed merge
wrote setup and introduction