Whatever I changed.
Removed files that weren't needed.
Merge branch 'master' of https://github.com/benjaminlackey/StackBNSPaper

Conflicts:
	paper.aux
	paper.log
	paper.synctex.gz
having commit problems