adding papers
fix conflict
Merge branch 'master' of github.com:ezubaric/jbg-web