Add paper.pdf to .gitignore
Merge branch 'master' of github.com:timvdalen/2II15-paper