Make an obvious improvement to the title
Merge branch 'master' of github.com:cmucosmo/awesome

Conflicts:
	paper1.tex